Skip to content

S
swiftshader
Commit f159eb55 by Alexis Hetu Committed by Alexis Hétu
Options

Fixing some warnings in libGLESv3.cpp

A missing & was causing an uninitialized parameter issue and a missing return in glGetUniformBlockIndex, in the case where the context is NULL, were causing warnings. Change-Id: Ifb40583c6d08d185d2e60f96066f1436398318ac Reviewed-on: https://swiftshader-review.googlesource.com/3436Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 29e280d4
Showing with 3 additions and 1 deletion
src/OpenGL/libGLESv2/libGLESv3.cpp
...@@ -402,7 +402,7 @@ static FormatMapStorage BuildFormatMapStorage2D() ...@@ -402,7 +402,7 @@ static FormatMapStorage BuildFormatMapStorage2D()
return map; return map;
} }
static bool GetStorageType(GLenum internalformat, GLenum type) static bool GetStorageType(GLenum internalformat, GLenum& type)
{ {
static const FormatMapStorage formatMap = BuildFormatMapStorage2D(); static const FormatMapStorage formatMap = BuildFormatMapStorage2D();
FormatMapStorage::const_iterator iter = formatMap.find(internalformat); FormatMapStorage::const_iterator iter = formatMap.find(internalformat);
...@@ -2758,6 +2758,8 @@ GL_APICALL GLuint GL_APIENTRY glGetUniformBlockIndex(GLuint program, const GLcha ...@@ -2758,6 +2758,8 @@ GL_APICALL GLuint GL_APIENTRY glGetUniformBlockIndex(GLuint program, const GLcha
return programObject->getUniformBlockIndex(uniformBlockName); return programObject->getUniformBlockIndex(uniformBlockName);
} }
return GL_INVALID_INDEX;
} }
GL_APICALL void GL_APIENTRY glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params) GL_APICALL void GL_APIENTRY glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
......
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