[Mesa-dev] [PATCH 11/13] mesa: De-duplicate ES2 queries

[Matt Turner]

On Tue, Dec 11, 2012 at 11:12 AM, Ian Romanick <idr at freedesktop.org> wrote:
> On 12/10/2012 02:28 PM, Matt Turner wrote:
>>
>>  From GL/GLES/GL_CORE and GLES2 -> GL/GL_CORE/GLES2.
>>
>> Yes, we really were exposing ES2_compatibility queries on ES 1.
>> ---
>>   src/mesa/main/get_hash_params.py |   16 ++++++----------
>>   1 files changed, 6 insertions(+), 10 deletions(-)
>>
>> diff --git a/src/mesa/main/get_hash_params.py
>> b/src/mesa/main/get_hash_params.py
>> index 650fb38..d0e8a76 100644
>> --- a/src/mesa/main/get_hash_params.py
>> +++ b/src/mesa/main/get_hash_params.py
>> @@ -204,12 +204,6 @@ descriptor=[
>>     [ "TEXTURE_COORD_ARRAY_TYPE", "LOC_CUSTOM, TYPE_ENUM, offsetof(struct
>> gl_client_array, Type), NO_EXTRA" ],
>>     [ "TEXTURE_COORD_ARRAY_STRIDE", "LOC_CUSTOM, TYPE_INT, offsetof(struct
>> gl_client_array, Stride), NO_EXTRA" ],
>>
>> -# GL_ARB_ES2_compatibility
>> -  [ "SHADER_COMPILER", "CONST(1), extra_ARB_ES2_compatibility" ],
>> -  [ "MAX_VARYING_VECTORS", "CONTEXT_INT(Const.MaxVarying),
>> extra_ARB_ES2_compatibility" ],
>> -  [ "MAX_VERTEX_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0,
>> extra_ARB_ES2_compatibility" ],
>> -  [ "MAX_FRAGMENT_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0,
>> extra_ARB_ES2_compatibility" ],
>> -
>>   # GL_ARB_multitexture
>>     [ "MAX_TEXTURE_UNITS", "CONTEXT_INT(Const.MaxTextureUnits), NO_EXTRA"
>> ],
>>     [ "CLIENT_ACTIVE_TEXTURE", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
>> @@ -310,6 +304,12 @@ descriptor=[
>>
>>   # GL_NV_read_buffer
>>     [ "READ_BUFFER", "LOC_CUSTOM, TYPE_ENUM, NO_OFFSET,
>> extra_NV_read_buffer_api_gl" ],
>> +
>> +# GL_ARB_ES2_compatibility
>> +  [ "SHADER_COMPILER", "CONST(1), extra_ARB_ES2_compatibility" ],
>> +  [ "MAX_VARYING_VECTORS", "CONTEXT_INT(Const.MaxVarying),
>> extra_ARB_ES2_compatibility" ],
>> +  [ "MAX_VERTEX_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0,
>> extra_ARB_ES2_compatibility" ],
>> +  [ "MAX_FRAGMENT_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0,
>> extra_ARB_ES2_compatibility" ],
>
>
> Are there any drivers in Mesa that support ES2 but do not advertise
> ARB_ES2_compatibility?  I think this will break those drivers.
>
>
>>   ]},
>>
>>   # GLES3 is not a typo.
>> @@ -373,10 +373,6 @@ descriptor=[
>>
>>   # Enums unique to OpenGL ES 2.0
>>   { "apis": ["GLES2"], "params": [
>> -  [ "MAX_FRAGMENT_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA"
>> ],
>> -  [ "MAX_VARYING_VECTORS", "CONTEXT_INT(Const.MaxVarying), NO_EXTRA" ],
>> -  [ "MAX_VERTEX_UNIFORM_VECTORS", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
>> -  [ "SHADER_COMPILER", "CONST(1), NO_EXTRA" ],
>>   # OES_get_program_binary
>>     [ "NUM_SHADER_BINARY_FORMATS", "CONST(0), NO_EXTRA" ],
>>     [ "SHADER_BINARY_FORMATS", "CONST(0), NO_EXTRA" ],
>>
>

Oh, the original version of this patch added EXTRA_API_ES2 to the
extra_* block. Consider that fixed.