Implemented glVertexAttribDivisor.

TRAC #22816 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2103 736b8ea6-26fd-11df-bfd4-992fa37f6226

Implemented glVertexAttribDivisor.
14eb55e5 · shannon.woods%transgaming.com@gtempaccount.com · 0b05b7a7 · 14eb55e5
Commit 14eb55e5 authored Apr 13, 2013 by shannon.woods%transgaming.com@gtempaccount.com
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 4 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +15 -4

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -4246,7 +4246,10 @@ void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
                    params[i] = attribState.mCurrentValue[i];
                }
                break;
-              case GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE:
+              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);
@@ -4303,7 +4306,10 @@ void __stdcall glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
                    params[i] = (GLint)(currentValue > 0.0f ? floor(currentValue + 0.5f) : ceil(currentValue - 0.5f));
                }
                break;
-              case GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE:
+              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 = (GLint)attribState.mDivisor;
                break;
              default: return gl::error(GL_INVALID_ENUM);
@@ -9389,6 +9395,11 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform

    try
    {
+        if (index >= gl::MAX_VERTEX_ATTRIBS)
+        {
+            return gl::error(GL_INVALID_VALUE);
+        }
+
        gl::Context *context = gl::getNonLostContext();

        if (context)
@@ -9397,9 +9408,9 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform
            {
                return gl::error(GL_INVALID_OPERATION);
            }
-        }

-        UNIMPLEMENTED();
+            context->setVertexAttribDivisor(index, divisor);
+        }
    }
    catch(std::bad_alloc&)
    {