[Mesa-dev] [PATCH v4 3/6] mesa/es3.1: enable GL_ARB_texture_multisample for GLES 3.1

[Lofstedt, Marta]

> -----Original Message-----
> From: mesa-dev [mailto:mesa-dev-bounces at lists.freedesktop.org] On
> Behalf Of Ilia Mirkin
> Sent: Thursday, June 25, 2015 10:22 PM
> To: Marta Lofstedt
> Cc: mesa-dev at lists.freedesktop.org
> Subject: Re: [Mesa-dev] [PATCH v4 3/6] mesa/es3.1: enable
> GL_ARB_texture_multisample for GLES 3.1
> 
> On Thu, Jun 25, 2015 at 5:08 AM, Marta Lofstedt
> <marta.lofstedt at linux.intel.com> wrote:
> > From: Marta Lofstedt <marta.lofstedt at intel.com>
> >
> > v4 : only expose GL_ARB_texture_multisample enums for gles 3.1 and
> > desktop GL.
> 
> I was suspicious of this logic. Based on my reading of the code, what your
> ARB_texture_multisample_es31 thing does is expose those enums when
> *either* the driver enables ARB_texture_multisample *or* the current
> context is ES3.1.
> 
> ARB_draw_indirect_es31 has the same problem, btw.
> 
> I could have misread the get.c extra_ext() logic, but I don't think I have. As
> far as I can tell there's no way to (generically) AND these things.
> 
> What you really need to do is create a whole new [GL, GL_CORE, ES31]
> section in get_hash_params and update get_hash_generator.py accordingly.
> 
> Cheers,
> 
>   -ilia
Hi Ilia,

Ian wrote earlier when commenting on this patch series:
    "Looking at this a little more, I think the existing block of these
    enums should be removed (except MAX_GEOMETRY_IMAGE_UNIFORMS), and
    this block should be added to the existing "["GL", "GL_CORE",
    "GLES3"]" block.

So, now I am really confused about how this should be sloved. 

/Marta

> 
> >
> > Signed-off-by: Marta Lofstedt <marta.lofstedt at intel.com>
> > ---
> >  src/mesa/main/get.c              |  6 ++++++
> >  src/mesa/main/get_hash_params.py | 18 +++++++++---------
> >  2 files changed, 15 insertions(+), 9 deletions(-)
> >
> > diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index
> > 4a0537d..6148349 100644
> > --- a/src/mesa/main/get.c
> > +++ b/src/mesa/main/get.c
> > @@ -367,6 +367,12 @@ static const int
> extra_ARB_shader_atomic_counters_es31[] = {
> >     EXTRA_END
> >  };
> >
> > +static const int extra_ARB_texture_multisample_es31[] = {
> > +   EXT(ARB_texture_multisample),
> > +   EXTRA_API_ES31,
> > +   EXTRA_END
> > +};
> > +
> >  EXTRA_EXT(ARB_texture_cube_map);
> >  EXTRA_EXT(EXT_texture_array);
> >  EXTRA_EXT(NV_fog_distance);
> > diff --git a/src/mesa/main/get_hash_params.py
> > b/src/mesa/main/get_hash_params.py
> > index e25dbe1..0026000 100644
> > --- a/src/mesa/main/get_hash_params.py
> > +++ b/src/mesa/main/get_hash_params.py
> > @@ -426,6 +426,15 @@ descriptor=[
> >    [ "MAX_FRAGMENT_ATOMIC_COUNTERS",
> "CONTEXT_INT(Const.Program[MESA_SHADER_FRAGMENT].MaxAtomicCou
> nters), extra_ARB_shader_atomic_counters_es31" ],
> >    [ "MAX_COMBINED_ATOMIC_COUNTER_BUFFERS",
> "CONTEXT_INT(Const.MaxCombinedAtomicBuffers),
> extra_ARB_shader_atomic_counters_es31" ],
> >    [ "MAX_COMBINED_ATOMIC_COUNTERS",
> > "CONTEXT_INT(Const.MaxCombinedAtomicCounters),
> > extra_ARB_shader_atomic_counters_es31" ],
> > +
> > +# GL_ARB_texture_multisample / GLES 3.1
> > +  [ "TEXTURE_BINDING_2D_MULTISAMPLE", "LOC_CUSTOM, TYPE_INT,
> > +TEXTURE_2D_MULTISAMPLE_INDEX,
> extra_ARB_texture_multisample_es31" ],
> > +  [ "TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY", "LOC_CUSTOM,
> TYPE_INT,
> > +TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX,
> > +extra_ARB_texture_multisample_es31" ],
> > +  [ "MAX_COLOR_TEXTURE_SAMPLES",
> > +"CONTEXT_INT(Const.MaxColorTextureSamples),
> > +extra_ARB_texture_multisample_es31" ],
> > +  [ "MAX_DEPTH_TEXTURE_SAMPLES",
> > +"CONTEXT_INT(Const.MaxDepthTextureSamples),
> > +extra_ARB_texture_multisample_es31" ],
> > +  [ "MAX_INTEGER_SAMPLES",
> "CONTEXT_INT(Const.MaxIntegerSamples),
> > +extra_ARB_texture_multisample_es31" ],
> > +  [ "SAMPLE_MASK", "CONTEXT_BOOL(Multisample.SampleMask),
> > +extra_ARB_texture_multisample_es31" ],
> > +  [ "MAX_SAMPLE_MASK_WORDS", "CONST(1),
> > +extra_ARB_texture_multisample_es31" ],
> >  ]},
> >
> >  # Enums in OpenGL Core profile and ES 3.1 @@ -717,15 +726,6 @@
> > 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 / GL 3.2
> > -  [ "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" ],
> > -  [ "MAX_COLOR_TEXTURE_SAMPLES",
> > "CONTEXT_INT(Const.MaxColorTextureSamples),
> > extra_ARB_texture_multisample" ],
> > -  [ "MAX_DEPTH_TEXTURE_SAMPLES",
> > "CONTEXT_INT(Const.MaxDepthTextureSamples),
> > extra_ARB_texture_multisample" ],
> > -  [ "MAX_INTEGER_SAMPLES",
> "CONTEXT_INT(Const.MaxIntegerSamples),
> > extra_ARB_texture_multisample" ],
> > -  [ "SAMPLE_MASK", "CONTEXT_BOOL(Multisample.SampleMask),
> > extra_ARB_texture_multisample" ],
> > -  [ "MAX_SAMPLE_MASK_WORDS", "CONST(1),
> > extra_ARB_texture_multisample" ],
> > -
> >  # GL 3.0
> >    [ "CONTEXT_FLAGS", "CONTEXT_INT(Const.ContextFlags),
> > extra_version_30" ],
> >
> > --
> > 1.9.1
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
----------------------------------------------------------------------
Intel Sweden AB
Registered Office: Knarrarnasgatan 15, 164 40 Kista, Stockholm, Sweden
Registration Number: 556189-6027

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.