[Mesa-dev] [PATCH 12/20] glsl/es3.1: Allow interger mix built-ins in GLSL ES 3.10

[Anuj Phogat]

On Wed, Apr 29, 2015 at 5:38 PM, Anuj Phogat <anuj.phogat at gmail.com> wrote:
> In patch heading: s/interger/integer
>
> On Wed, Apr 29, 2015 at 4:26 PM, Ian Romanick <idr at freedesktop.org> wrote:
>> From: Ian Romanick <ian.d.romanick at intel.com>
>>
>> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
>> ---
>>  src/glsl/builtin_functions.cpp | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
>> index 5ce8112..435d926 100644
>> --- a/src/glsl/builtin_functions.cpp
>> +++ b/src/glsl/builtin_functions.cpp
>> @@ -194,7 +194,8 @@ shader_bit_encoding(const _mesa_glsl_parse_state *state)
>>  static bool
>>  shader_integer_mix(const _mesa_glsl_parse_state *state)
>>  {
>> -   return v130(state) && state->EXT_shader_integer_mix_enable;
>> +   return state->is_version(450, 310) ||
>> +          v130(state) && state->EXT_shader_integer_mix_enable;
>>  }
>>
>>  static bool
>> --
>> 2.1.0
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Patches 1-12 are: Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>