[Mesa-dev] [PATCH] mesa: use _mesa_has_compute_shaders instead of extension check

Tapani tapani.palli at intel.com
Wed May 6 22:05:02 PDT 2015


On 05/07/2015 08:02 AM, Ilia Mirkin wrote:
> On Thu, May 7, 2015 at 12:55 AM, Tapani Pälli <tapani.palli at intel.com> wrote:
>> 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).
>>
>> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
>> ---
>>   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..00f61ef 100644
>> --- a/src/mesa/main/shader_query.cpp
>> +++ b/src/mesa/main/shader_query.cpp
>> @@ -28,6 +28,7 @@
>>    * \author Ian Romanick <ian.d.romanick at intel.com>
>>    */
>>
>> +#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))
> oops?

oh dear, this 'little change' is starting to be much more difficult than 
I originally thought .. sorry

>>            goto invalid_enum;
>> +      /* FALLTHROUGH */
> fwiw, i've seen everywhere else lowercase it. perhaps that's just in
> my corner of the world.

right, there seems to be both of these in use, I happened to pick 
uppercase because that's what I've seen, I can change this since it's 
the first one in this file.

>>      case GL_REFERENCED_BY_VERTEX_SHADER:
>>      case GL_REFERENCED_BY_GEOMETRY_SHADER:
>>      case GL_REFERENCED_BY_FRAGMENT_SHADER:
>> --
>> 2.1.0
>>



More information about the mesa-dev mailing list