Add a few new glGet functions

This commit is contained in:
Baldur Karlsson
2014-07-29 13:59:21 +01:00
parent 3952dfba2b
commit a76d70831a
4 changed files with 27 additions and 0 deletions
+3
View File
@@ -480,11 +480,14 @@ class WrappedOpenGL
IMPLEMENT_FUNCTION_SERIALISED(void, glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices));
IMPLEMENT_FUNCTION_SERIALISED(GLuint, glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName));
IMPLEMENT_FUNCTION_SERIALISED(void, glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params));
IMPLEMENT_FUNCTION_SERIALISED(void, glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params));
IMPLEMENT_FUNCTION_SERIALISED(void, glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name));
IMPLEMENT_FUNCTION_SERIALISED(void, glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name));
IMPLEMENT_FUNCTION_SERIALISED(GLint, glGetAttribLocation(GLuint program, const GLchar *name));
IMPLEMENT_FUNCTION_SERIALISED(void, glGetUniformfv(GLuint program, GLint location, GLfloat *params));
IMPLEMENT_FUNCTION_SERIALISED(void, glGetUniformiv(GLuint program, GLint location, GLint *params));
IMPLEMENT_FUNCTION_SERIALISED(void, glGetUniformuiv(GLuint program, GLint location, GLuint *params));
IMPLEMENT_FUNCTION_SERIALISED(void, glGetUniformdv(GLuint program, GLint location, GLdouble *params));
enum UniformType
{
+3
View File
@@ -238,10 +238,13 @@ struct GLHookSet
PFNGLGETUNIFORMBLOCKINDEXPROC glGetUniformBlockIndex;
PFNGLGETATTRIBLOCATIONPROC glGetAttribLocation;
PFNGLGETACTIVEUNIFORMPROC glGetActiveUniform;
PFNGLGETACTIVEUNIFORMBLOCKIVPROC glGetActiveUniformBlockiv;
PFNGLGETACTIVEUNIFORMSIVPROC glGetActiveUniformsiv;
PFNGLGETACTIVEATTRIBPROC glGetActiveAttrib;
PFNGLGETUNIFORMFVPROC glGetUniformfv;
PFNGLGETUNIFORMIVPROC glGetUniformiv;
PFNGLGETUNIFORMUIVPROC glGetUniformuiv;
PFNGLGETUNIFORMDVPROC glGetUniformdv;
PFNGLUNIFORMBLOCKBINDINGPROC glUniformBlockBinding;
PFNGLUNIFORMMATRIX4FVPROC glUniformMatrix4fv;
PFNGLUNIFORM1FPROC glUniform1f;
+6
View File
@@ -252,10 +252,13 @@
HookExtension(PFNGLGETUNIFORMBLOCKINDEXPROC, glGetUniformBlockIndex); \
HookExtension(PFNGLGETATTRIBLOCATIONPROC, glGetAttribLocation); \
HookExtension(PFNGLGETACTIVEUNIFORMPROC, glGetActiveUniform); \
HookExtension(PFNGLGETACTIVEUNIFORMBLOCKIVPROC, glGetActiveUniformBlockiv); \
HookExtension(PFNGLGETACTIVEUNIFORMSIVPROC, glGetActiveUniformsiv); \
HookExtension(PFNGLGETACTIVEATTRIBPROC, glGetActiveAttrib); \
HookExtension(PFNGLGETUNIFORMFVPROC, glGetUniformfv); \
HookExtension(PFNGLGETUNIFORMIVPROC, glGetUniformiv); \
HookExtension(PFNGLGETUNIFORMUIVPROC, glGetUniformuiv); \
HookExtension(PFNGLGETUNIFORMDVPROC, glGetUniformdv); \
HookExtension(PFNGLUNIFORMBLOCKBINDINGPROC, glUniformBlockBinding); \
HookExtension(PFNGLUNIFORMMATRIX4FVPROC, glUniformMatrix4fv); \
HookExtension(PFNGLUNIFORM1FPROC, glUniform1f); \
@@ -592,10 +595,13 @@
HookWrapper2(GLuint, glGetUniformBlockIndex, GLuint, program, const GLchar *, uniformBlockName); \
HookWrapper2(GLint, glGetAttribLocation, GLuint, program, const GLchar *, name); \
HookWrapper7(void, glGetActiveUniform, GLuint, program, GLuint, index, GLsizei, bufSize, GLsizei *, length, GLint *, size, GLenum *, type, GLchar *, name); \
HookWrapper4(void, glGetActiveUniformBlockiv, GLuint, program, GLuint, uniformBlockIndex, GLenum, pname, GLint *, params); \
HookWrapper5(void, glGetActiveUniformsiv, GLuint, program, GLsizei, uniformCount, const GLuint *, uniformIndices, GLenum, pname, GLint *, params); \
HookWrapper7(void, glGetActiveAttrib, GLuint, program, GLuint, index, GLsizei, bufSize, GLsizei *, length, GLint *, size, GLenum *, type, GLchar *, name); \
HookWrapper3(void, glGetUniformfv, GLuint, program, GLint, location, GLfloat *, params); \
HookWrapper3(void, glGetUniformiv, GLuint, program, GLint, location, GLint *, params); \
HookWrapper3(void, glGetUniformuiv, GLuint, program, GLint, location, GLuint *, params); \
HookWrapper3(void, glGetUniformdv, GLuint, program, GLint, location, GLdouble *, params); \
HookWrapper3(void, glUniformBlockBinding, GLuint, program, GLuint, uniformBlockIndex, GLuint, uniformBlockBinding); \
HookWrapper4(void, glUniformMatrix4fv, GLint, location, GLsizei, count, GLboolean, transpose, const GLfloat *, value); \
HookWrapper2(void, glUniform1f, GLint, location, GLfloat, v0); \
@@ -315,6 +315,11 @@ void WrappedOpenGL::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount,
m_Real.glGetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
}
void WrappedOpenGL::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
{
m_Real.glGetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
}
void WrappedOpenGL::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
{
m_Real.glGetActiveAttrib(program, index, bufSize, length, size, type, name);
@@ -330,6 +335,16 @@ void WrappedOpenGL::glGetUniformiv(GLuint program, GLint location, GLint *params
m_Real.glGetUniformiv(program, location, params);
}
void WrappedOpenGL::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
{
m_Real.glGetUniformuiv(program, location, params);
}
void WrappedOpenGL::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
{
m_Real.glGetUniformdv(program, location, params);
}
void WrappedOpenGL::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels)
{
m_Real.glReadPixels(x, y, width, height, format, type, pixels);