Mesa (master): mesa: support inactive uniforms in glUniform* functions
Tapani Pälli
tpalli at kemper.freedesktop.org
Mon Jun 16 04:20:17 UTC 2014
Module: Mesa
Branch: master
Commit: 73f7c8636dff34ef4254e0d89fc7670e35a36da9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=73f7c8636dff34ef4254e0d89fc7670e35a36da9
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Wed Mar 19 10:39:10 2014 +0000
mesa: support inactive uniforms in glUniform* functions
Support inactive uniforms that have explicit location set in
glUniform* functions.
v2: remove unnecessary extension check, use new define (Ian)
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/main/uniform_query.cpp | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 5f1af08..480bc6f 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -253,6 +253,21 @@ validate_uniform_parameters(struct gl_context *ctx,
return false;
}
+ /* If the driver storage pointer in remap table is -1, we ignore silently.
+ *
+ * GL_ARB_explicit_uniform_location spec says:
+ * "What happens if Uniform* is called with an explicitly defined
+ * uniform location, but that uniform is deemed inactive by the
+ * linker?
+ *
+ * RESOLVED: The call is ignored for inactive uniform variables and
+ * no error is generated."
+ *
+ */
+ if (shProg->UniformRemapTable[location] ==
+ INACTIVE_UNIFORM_EXPLICIT_LOCATION)
+ return false;
+
_mesa_uniform_split_location_offset(shProg, location, loc, array_index);
if (shProg->UniformStorage[*loc].array_elements == 0 && count > 1) {
More information about the mesa-commit
mailing list