[Mesa-dev] [PATCH] mesa: uncomment checks in es31 computation, add texture_ms

[Ilia Mirkin]

On Mon, Aug 24, 2015 at 9:43 AM, Martin Peres
<martin.peres at linux.intel.com> wrote:
> On 24/08/15 16:36, Ilia Mirkin wrote:
>>
>> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
>> ---
>>
>> There's a patch on-list to uncomment the
>> ARB_framebuffer_no_attachments one, so I'm leaving it alone. The other
>> enables are all there. Also ARB_texture_multisample was missed in the
>> requirement list. While not a perfect match, neither is
>> ARB_gpu_shader5, which is happily on there.
>>
>>   src/mesa/main/version.c | 5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
>> index fd7ae53..726e397 100644
>> --- a/src/mesa/main/version.c
>> +++ b/src/mesa/main/version.c
>> @@ -453,10 +453,11 @@ compute_version_es2(const struct gl_extensions
>> *extensions)
>>                            false
>> /*extensions->ARB_framebuffer_no_attachments*/ &&
>>                            extensions->ARB_shader_atomic_counters &&
>>                            extensions->ARB_shader_image_load_store &&
>> -                         false /*extensions->ARB_shader_image_size*/ &&
>> -                         false
>> /*extensions->ARB_shader_storage_buffer_object*/ &&
>> +                         extensions->ARB_shader_image_size &&
>> +                         extensions->ARB_shader_storage_buffer_object &&
>>                            extensions->ARB_shading_language_packing &&
>>                            extensions->ARB_stencil_texturing &&
>> +                         extensions->ARB_texture_multisample &&
>>                            extensions->ARB_gpu_shader5 &&
>>                            extensions->EXT_shader_integer_mix);
>
>
> Thanks, we talked about that this morning with Tapani. I would say you
> should also uncomment ARB_framebuffer_no_attachments but that's up to you.

I didn't want to create unnecessary conflicts with whoever sent that
patch (Marta? sorry, I don't remember and am much too lazy to check).
If whoever posted the patch OKs it, I'll happily uncomment it as well.

>
> Reviewed-by: Martin Peres <martin.peres at linux.intel.com>

Thanks!