Mesa (master): mesa: Uniform logging is very, very unlikely
Ian Romanick
idr at kemper.freedesktop.org
Mon Nov 10 12:27:35 UTC 2014
Module: Mesa
Branch: master
Commit: 8e4a6481e81d38bff51a2ee72d8b754547376eeb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e4a6481e81d38bff51a2ee72d8b754547376eeb
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Mon Oct 20 17:02:55 2014 -0700
mesa: Uniform logging is very, very unlikely
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
---
src/mesa/main/uniform_query.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index f971ba1..32870d0 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -634,7 +634,7 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,
return;
}
- if (ctx->_Shader->Flags & GLSL_UNIFORMS) {
+ if (unlikely(ctx->_Shader->Flags & GLSL_UNIFORMS)) {
log_uniform(values, basicType, components, 1, count,
false, shProg, location, uni);
}
@@ -846,7 +846,7 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
}
}
- if (ctx->_Shader->Flags & GLSL_UNIFORMS) {
+ if (unlikely(ctx->_Shader->Flags & GLSL_UNIFORMS)) {
log_uniform(values, GLSL_TYPE_FLOAT, components, vectors, count,
bool(transpose), shProg, location, uni);
}
More information about the mesa-commit
mailing list