On 29 December 2012 04:35, Chris Forbes <chr...@ijw.co.nz> wrote:
> Signed-off-by: Chris Forbes <chr...@ijw.co.nz>
> ---
> src/mesa/main/get.c | 9 +++++++++
> src/mesa/main/get_hash_params.py | 5 +++++
> 2 files changed, 14 insertions(+)
>
> diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> index 273a79f..4c227a8 100644
> --- a/src/mesa/main/get.c
> +++ b/src/mesa/main/get.c
> @@ -337,6 +337,7 @@ EXTRA_EXT(ARB_uniform_buffer_object);
> EXTRA_EXT(ARB_timer_query);
> EXTRA_EXT(ARB_map_buffer_alignment);
> EXTRA_EXT(ARB_texture_cube_map_array);
> +EXTRA_EXT(ARB_texture_multisample);
>
> static const int
> extra_NV_primitive_restart[] = {
> @@ -796,6 +797,14 @@ find_custom_value(struct gl_context *ctx, const
> struct value_desc *d, union valu
> .CurrentTex[TEXTURE_BUFFER_INDEX]->BufferObjectFormat;
> break;
>
> + /* GL_ARB_texture_multisample */
> + case GL_TEXTURE_BINDING_2D_MULTISAMPLE:
> + case GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY:
> + unit = ctx->Texture.CurrentUnit;
> + v->value_int =
> + ctx->Texture.Unit[unit].CurrentTex[d->offset]->Name;
> + break;
> +
>
This block looks identical to the existing block that handles
GL_TEXTURE_BINDING_1D, GL_TEXTURE_BINDING_2D, etc. Rather than duplicate
code, we should just add two new cases to the existing block.
> /* GL_ARB_sampler_objects */
> case GL_SAMPLER_BINDING:
> {
> diff --git a/src/mesa/main/get_hash_params.py
> b/src/mesa/main/get_hash_params.py
> index ac9c79c..40e25e7 100644
> --- a/src/mesa/main/get_hash_params.py
> +++ b/src/mesa/main/get_hash_params.py
> @@ -638,6 +638,11 @@ descriptor=[
> [ "TEXTURE_BUFFER_FORMAT_ARB", "LOC_CUSTOM, TYPE_INT, 0,
> extra_texture_buffer_object" ],
> [ "TEXTURE_BUFFER_ARB", "LOC_CUSTOM, TYPE_INT, 0,
> extra_texture_buffer_object" ],
>
> +# GL_ARB_texture_multisample
> + [ "TEXTURE_BINDING_2D_MULTISAMPLE", "LOC_CUSTOM, TYPE_INT,
> TEXTURE_2D_MULTISAMPLE_INDEX, extra_ARB_texture_multisample" ],
> + [ "TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY", "LOC_CUSTOM, TYPE_INT,
> TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX, extra_ARB_texture_multisample" ],
> +
> +
> # GL_ARB_sampler_objects / GL 3.3
> [ "SAMPLER_BINDING", "LOC_CUSTOM, TYPE_INT, GL_SAMPLER_BINDING,
> NO_EXTRA" ],
>
> --
> 1.8.0.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
