commit 8736bd6b02d21c666bdfdd52d2b2cd17ea664a0e
author shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:35:41 2013 +0000
committer shannon.woods%transgaming.com@gtempaccount.com <shannon.woods%transgaming.com@gtempaccount.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Sat Apr 13 03:35:41 2013 +0000
tree 792128038191d0eb6e948d866e7fe83470e2e939
parent 8bce3f59f55ebbef64e2a7b0f024644afbebd5b0

Fixed build failure.

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2108 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index 5f6cf1c..723b734 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -4249,7 +4249,6 @@
               case GL_VERTEX_ATTRIB_ARRAY_DIVISOR:
                 // Don't verify ES3 context because GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE uses
                 // the same constant.
-                META_ASSERT(GL_VERTEX_ATTRIB_ARRAY_DIVISOR == GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE);
                 *params = (GLfloat)attribState.mDivisor;
                 break;
               default: return gl::error(GL_INVALID_ENUM);
@@ -9072,6 +9071,11 @@
 
     try
     {
+        if (index >= gl::MAX_VERTEX_ATTRIBS)
+        {
+            return gl::error(GL_INVALID_VALUE);
+        }
+
         gl::Context *context = gl::getNonLostContext();
 
         if (context)
@@ -9080,9 +9084,9 @@
             {
                 return gl::error(GL_INVALID_OPERATION);
             }
-        }
 
-        UNIMPLEMENTED();
+            context->setVertexAttribDivisor(index, divisor);
+        }
     }
     catch(std::bad_alloc&)
     {
@@ -9395,11 +9399,6 @@
 
     try
     {
-        if (index >= gl::MAX_VERTEX_ATTRIBS)
-        {
-            return gl::error(GL_INVALID_VALUE);
-        }
-
         gl::Context *context = gl::getNonLostContext();
 
         if (context)
@@ -9408,8 +9407,6 @@
             {
                 return gl::error(GL_INVALID_OPERATION);
             }
-
-            context->setVertexAttribDivisor(index, divisor);
         }
     }
     catch(std::bad_alloc&)