This patch is
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
On 12/11/2014 02:34 PM, Eduardo Lima Mitev wrote:
> From GLES3 specification (page 123), "The currently bound sampler may be
> queried by calling GetIntegerv with pname set to
> SAMPLER_BINDINGGL_SAMPLER_BINDING".
>
> Fixes 4 dEQP tests:
> * dEQP-GLES3.functional.state_query.integers.sampler_binding_getboolean
> * dEQP-GLES3.functional.state_query.integers.sampler_binding_getinteger
> * dEQP-GLES3.functional.state_query.integers.sampler_binding_getinteger64
> * dEQP-GLES3.functional.state_query.integers.sampler_binding_getfloat
> ---
> src/mesa/main/get_hash_params.py | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/src/mesa/main/get_hash_params.py
> b/src/mesa/main/get_hash_params.py
> index a3bf1cb..c70ed04 100644
> --- a/src/mesa/main/get_hash_params.py
> +++ b/src/mesa/main/get_hash_params.py
> @@ -403,6 +403,11 @@ descriptor=[
> [ "TEXTURE_EXTERNAL_OES", "LOC_CUSTOM, TYPE_BOOLEAN, 0,
> extra_OES_EGL_image_external" ],
> ]},
>
> +{ "apis": ["GL", "GL_CORE", "GLES3"], "params": [
> +# GL_ARB_sampler_objects / GL 3.3 / GLES 3.0
> + [ "SAMPLER_BINDING", "LOC_CUSTOM, TYPE_INT, GL_SAMPLER_BINDING, NO_EXTRA"
> ],
> +]},
> +
> # Remaining enums are only in OpenGL
> { "apis": ["GL", "GL_CORE"], "params": [
> [ "ACCUM_RED_BITS", "BUFFER_INT(Visual.accumRedBits), NO_EXTRA" ],
> @@ -695,10 +700,6 @@ descriptor=[
> [ "SAMPLE_MASK", "CONTEXT_BOOL(Multisample.SampleMask),
> extra_ARB_texture_multisample" ],
> [ "MAX_SAMPLE_MASK_WORDS", "CONST(1), extra_ARB_texture_multisample" ],
>
> -
> -# GL_ARB_sampler_objects / GL 3.3
> - [ "SAMPLER_BINDING", "LOC_CUSTOM, TYPE_INT, GL_SAMPLER_BINDING, NO_EXTRA"
> ],
> -
> # GL 3.0
> [ "CONTEXT_FLAGS", "CONTEXT_INT(Const.ContextFlags), extra_version_30" ],
>
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
