Fixed build failure.

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2108 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 8bce3f59
...@@ -4249,7 +4249,6 @@ void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) ...@@ -4249,7 +4249,6 @@ void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
case GL_VERTEX_ATTRIB_ARRAY_DIVISOR: case GL_VERTEX_ATTRIB_ARRAY_DIVISOR:
// Don't verify ES3 context because GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE uses // Don't verify ES3 context because GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE uses
// the same constant. // the same constant.
META_ASSERT(GL_VERTEX_ATTRIB_ARRAY_DIVISOR == GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE);
*params = (GLfloat)attribState.mDivisor; *params = (GLfloat)attribState.mDivisor;
break; break;
default: return gl::error(GL_INVALID_ENUM); default: return gl::error(GL_INVALID_ENUM);
...@@ -9072,6 +9071,11 @@ void __stdcall glVertexAttribDivisor(GLuint index, GLuint divisor) ...@@ -9072,6 +9071,11 @@ void __stdcall glVertexAttribDivisor(GLuint index, GLuint divisor)
try try
{ {
if (index >= gl::MAX_VERTEX_ATTRIBS)
{
return gl::error(GL_INVALID_VALUE);
}
gl::Context *context = gl::getNonLostContext(); gl::Context *context = gl::getNonLostContext();
if (context) if (context)
...@@ -9080,9 +9084,9 @@ void __stdcall glVertexAttribDivisor(GLuint index, GLuint divisor) ...@@ -9080,9 +9084,9 @@ void __stdcall glVertexAttribDivisor(GLuint index, GLuint divisor)
{ {
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
}
UNIMPLEMENTED(); context->setVertexAttribDivisor(index, divisor);
}
} }
catch(std::bad_alloc&) catch(std::bad_alloc&)
{ {
...@@ -9395,11 +9399,6 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform ...@@ -9395,11 +9399,6 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform
try try
{ {
if (index >= gl::MAX_VERTEX_ATTRIBS)
{
return gl::error(GL_INVALID_VALUE);
}
gl::Context *context = gl::getNonLostContext(); gl::Context *context = gl::getNonLostContext();
if (context) if (context)
...@@ -9408,8 +9407,6 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform ...@@ -9408,8 +9407,6 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform
{ {
return gl::error(GL_INVALID_OPERATION); return gl::error(GL_INVALID_OPERATION);
} }
context->setVertexAttribDivisor(index, divisor);
} }
} }
catch(std::bad_alloc&) catch(std::bad_alloc&)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment