Skip to content

A
angle
Commit 8431b9c8 by shannon.woods%transgaming.com@gtempaccount.com
Options

Modify the glUniform[X]ui calls to call the corresponding glUniform[X]uiv functions internally.

TRAC #22842 Signed-off-by: Geoff Lang Signed-off-by: Shanon Woods Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2140 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent a741b641
Showing with 7 additions and 84 deletions
src/libGLESv2/libGLESv2.cpp
......@@ -8457,102 +8457,25 @@ GLint __stdcall glGetFragDataLocation(GLuint program, const GLchar *name)
void __stdcall glUniform1ui(GLint location, GLuint v0)
{
EVENT("(GLint location = %d, GLuint v0 = %u)",
location, v0);
try
{
gl::Context *context = gl::getNonLostContext();
if (context)
{
if (context->getClientVersion() < 3)
{
return gl::error(GL_INVALID_OPERATION);
}
}
UNIMPLEMENTED();
}
catch(std::bad_alloc&)
{
return gl::error(GL_OUT_OF_MEMORY);
}
glUniform1uiv(location, 1, &v0);
}
void __stdcall glUniform2ui(GLint location, GLuint v0, GLuint v1)
{
EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u)",
location, v0, v1);
try
{
gl::Context *context = gl::getNonLostContext();
if (context)
{
if (context->getClientVersion() < 3)
{
return gl::error(GL_INVALID_OPERATION);
}
}
UNIMPLEMENTED();
}
catch(std::bad_alloc&)
{
return gl::error(GL_OUT_OF_MEMORY);
}
const GLuint xy[] = { v0, v1 };
glUniform2uiv(location, 1, xy);
}
void __stdcall glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
{
EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u)",
location, v0, v1, v2);
try
{
gl::Context *context = gl::getNonLostContext();
if (context)
{
if (context->getClientVersion() < 3)
{
return gl::error(GL_INVALID_OPERATION);
}
}
UNIMPLEMENTED();
}
catch(std::bad_alloc&)
{
return gl::error(GL_OUT_OF_MEMORY);
}
const GLuint xyz[] = { v0, v1, v2 };
glUniform3uiv(location, 1, xyz);
}
void __stdcall glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
{
EVENT("(GLint location = %d, GLuint v0 = %u, GLuint v1 = %u, GLuint v2 = %u, GLuint v3 = %u)",
location, v0, v1, v2, v3);
try
{
gl::Context *context = gl::getNonLostContext();
if (context)
{
if (context->getClientVersion() < 3)
{
return gl::error(GL_INVALID_OPERATION);
}
}
UNIMPLEMENTED();
}
catch(std::bad_alloc&)
{
return gl::error(GL_OUT_OF_MEMORY);
}
const GLuint xyzw[] = { v0, v1, v2, v3 };
glUniform4uiv(location, 1, xyzw);
}
void __stdcall glUniform1uiv(GLint location, GLsizei count, const GLuint* value)
......
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