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: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Fixing some warnings in libGLESv3.cpp
f159eb55 · Alexis Hetu · Alexis Hétu · 29e280d4 · f159eb55
Commit f159eb55 authored Jun 09, 2015 by Alexis Hetu Committed by Alexis Hétu Jun 09, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

libGLESv3.cpp src/OpenGL/libGLESv2/libGLESv3.cpp +3 -1

No files found.
--- a/src/OpenGL/libGLESv2/libGLESv3.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv3.cpp
@@ -402,7 +402,7 @@ static FormatMapStorage BuildFormatMapStorage2D()
 	return map;
 }

-static bool GetStorageType(GLenum internalformat, GLenum type)
+static bool GetStorageType(GLenum internalformat, GLenum& type)
 {
 	static const FormatMapStorage formatMap = BuildFormatMapStorage2D();
 	FormatMapStorage::const_iterator iter = formatMap.find(internalformat);
@@ -2758,6 +2758,8 @@ GL_APICALL GLuint GL_APIENTRY glGetUniformBlockIndex(GLuint program, const GLcha

 		return programObject->getUniformBlockIndex(uniformBlockName);
 	}
+
+	return GL_INVALID_INDEX;
 }

 GL_APICALL void GL_APIENTRY glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)