Module: Mesa Branch: master Commit: abf3fefa1aa734844e0ca8e95e8c3a501909aa33 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=abf3fefa1aa734844e0ca8e95e8c3a501909aa33
Author: Tapani Pälli <[email protected]> Date: Thu May 7 08:07:30 2015 +0300 mesa: use _mesa_has_compute_shaders instead of extension check This was really the original purpose, for enabling the path for ES3.1 tests without the extension being set. Set also fallthrough comment for Coverity (caught by Matt). v2: .. and test the right way, not wrong one (Ilia Mirkin) Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Ilia Mirkin <[email protected]> --- src/mesa/main/shader_query.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 6e46553..3445f89 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -28,6 +28,7 @@ * \author Ian Romanick <[email protected]> */ +#include "main/context.h" #include "main/core.h" #include "glsl_symbol_table.h" #include "ir.h" @@ -986,8 +987,9 @@ _mesa_program_resource_prop(struct gl_shader_program *shProg, case GL_ACTIVE_VARIABLES: return get_buffer_property(shProg, res, prop, val, caller); case GL_REFERENCED_BY_COMPUTE_SHADER: - if (!ctx->Extensions.ARB_compute_shader) + if (!_mesa_has_compute_shaders(ctx)) goto invalid_enum; + /* fallthrough */ case GL_REFERENCED_BY_VERTEX_SHADER: case GL_REFERENCED_BY_GEOMETRY_SHADER: case GL_REFERENCED_BY_FRAGMENT_SHADER: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
