Search
SailfishOS Open Build Service
>
Projects
>
home:ced117
:
sailfish
>
xulrunner-qt5
> _service:tar_git:0013-Bug-1207205-Remove-fGetActiveUniformName.-r-jrmuizel.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File _service:tar_git:0013-Bug-1207205-Remove-fGetActiveUniformName.-r-jrmuizel.patch of Package xulrunner-qt5
From 317ba8b98e828a994f23ecba1fbddf4ff6a403ce Mon Sep 17 00:00:00 2001 From: Dan Glastonbury <dglastonbury@mozilla.com> Date: Wed, 30 Sep 2015 14:04:17 +1300 Subject: [PATCH 13/15] Bug 1207205 - Remove fGetActiveUniformName. r=jrmuizel Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com> --- gfx/gl/GLContext.cpp | 3 ++- gfx/gl/GLContext.h | 9 --------- gfx/gl/GLContextSymbols.h | 2 -- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp index fd874f0..0eb66db 100644 --- a/gfx/gl/GLContext.cpp +++ b/gfx/gl/GLContext.cpp @@ -1314,10 +1314,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 } }, diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h index 05406c9..912cfb2 100644 --- a/gfx/gl/GLContext.h +++ b/gfx/gl/GLContext.h @@ -3026,15 +3026,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; diff --git a/gfx/gl/GLContextSymbols.h b/gfx/gl/GLContextSymbols.h index 91ff5ac..c7fd838 100644 --- a/gfx/gl/GLContextSymbols.h +++ b/gfx/gl/GLContextSymbols.h @@ -600,8 +600,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); -- 2.1.4