Skip to content

A
angle
Commit 14eb55e5 by shannon.woods%transgaming.com@gtempaccount.com
Options

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
parent 0b05b7a7
Showing with 15 additions and 4 deletions
src/libGLESv2/libGLESv2.cpp
...@@ -4246,7 +4246,10 @@ void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) ...@@ -4246,7 +4246,10 @@ void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
params[i] = attribState.mCurrentValue[i]; params[i] = attribState.mCurrentValue[i];
} }
break; 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; *params = (GLfloat)attribState.mDivisor;
break; break;
default: return gl::error(GL_INVALID_ENUM); default: return gl::error(GL_INVALID_ENUM);
...@@ -4303,7 +4306,10 @@ void __stdcall glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params) ...@@ -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)); params[i] = (GLint)(currentValue > 0.0f ? floor(currentValue + 0.5f) : ceil(currentValue - 0.5f));
} }
break; 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; *params = (GLint)attribState.mDivisor;
break; break;
default: return gl::error(GL_INVALID_ENUM); default: return gl::error(GL_INVALID_ENUM);
...@@ -9389,6 +9395,11 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform ...@@ -9389,6 +9395,11 @@ 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)
...@@ -9397,9 +9408,9 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform ...@@ -9397,9 +9408,9 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform
{ {
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&)
{ {
......
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