Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1207205 - Remove fGetActiveUniformName. r=jrmuizel

Browse Source
This commit is contained in:
Dan Glastonbury 2015-09-30 14:04:17 +13:00
parent af8cf1df88
commit c5f6855012
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/gl/GLContext.cpp
View File

@ -1431,10 +1431,11 @@ GLContext::InitWithPrefix(const char *prefix, bool trygl)
}
if (IsSupported(GLFeature::uniform_buffer_object)) {
// Note: Don't query for glGetActiveUniformName because it is not
// supported by GL ES 3.
SymLoadStruct uboSymbols[] = {
{ (PRFuncPtr*) &mSymbols.fGetUniformIndices, { "GetUniformIndices", nullptr } },
{ (PRFuncPtr*) &mSymbols.fGetActiveUniformsiv, { "GetActiveUniformsiv", nullptr } },
{ (PRFuncPtr*) &mSymbols.fGetActiveUniformName, { "GetActiveUniformName", nullptr } },
{ (PRFuncPtr*) &mSymbols.fGetUniformBlockIndex, { "GetUniformBlockIndex", nullptr } },
{ (PRFuncPtr*) &mSymbols.fGetActiveUniformBlockiv, { "GetActiveUniformBlockiv", nullptr } },
{ (PRFuncPtr*) &mSymbols.fGetActiveUniformBlockName, { "GetActiveUniformBlockName", nullptr } },

9
gfx/gl/GLContext.h
View File

@ -3011,15 +3011,6 @@ public:
AFTER_GL_CALL;
}
void fGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize,
GLsizei* length, GLchar* uniformName)
{
ASSERT_SYMBOL_PRESENT(fGetActiveUniformName);
BEFORE_GL_CALL;
mSymbols.fGetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
AFTER_GL_CALL;
}
GLuint fGetUniformBlockIndex(GLuint program, const GLchar* uniformBlockName) {
ASSERT_SYMBOL_PRESENT(fGetUniformBlockIndex);
BEFORE_GL_CALL;

2
gfx/gl/GLContextSymbols.h
View File

@ -614,8 +614,6 @@ struct GLContextSymbols
typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices,
GLenum pname, GLint* params);
PFNGLGETACTIVEUNIFORMSIVPROC fGetActiveUniformsiv;
typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIdex, GLsizei bufSize, GLsizei* length, GLchar* uniformName);
PFNGLGETACTIVEUNIFORMNAMEPROC fGetActiveUniformName;
typedef GLuint (GLAPIENTRY * PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar* uniformBlockName);
PFNGLGETUNIFORMBLOCKINDEXPROC fGetUniformBlockIndex;
typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params);