> -----Original Message----- > From: ibmir...@gmail.com [mailto:ibmir...@gmail.com] On Behalf Of Ilia > Mirkin > Sent: Thursday, January 21, 2016 4:24 PM > To: Marta Lofstedt > Cc: mesa-dev@lists.freedesktop.org; Lofstedt, Marta > Subject: Re: [PATCH 2/4] mesa: enable enums for OES_geometry_shader > > On Thu, Jan 21, 2016 at 10:17 AM, Marta Lofstedt > <marta.lofst...@linux.intel.com> wrote: > > From: Marta Lofstedt <marta.lofst...@intel.com> > > > > Enable GL_OES_geometry_shader enums for OpenGL ES 3.1. > > > > V4: EXTRA tokens updated according to comments from Ilia Mirkin. > > > > Signed-off-by: Marta Lofstedt <marta.lofst...@linux.intel.com> > > Reviewed-by: Tapani Pälli <tapani.pa...@intel.com> > > --- > > src/mesa/main/get.c | 65 > ++++++++++++++++++++++++++++++++++------ > > src/mesa/main/get_hash_params.py | 52 > > +++++++++++++++++++------------- > > 2 files changed, 87 insertions(+), 30 deletions(-) > > > > diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index > > 95cb18c..d8f9e25a 100644 > > --- a/src/mesa/main/get.c > > +++ b/src/mesa/main/get.c > > @@ -147,11 +147,14 @@ enum value_extra { > > EXTRA_VALID_CLIP_DISTANCE, > > EXTRA_FLUSH_CURRENT, > > EXTRA_GLSL_130, > > - EXTRA_EXT_UBO_GS4, > > - EXTRA_EXT_ATOMICS_GS4, > > - EXTRA_EXT_SHADER_IMAGE_GS4, > > + EXTRA_EXT_UBO_GS, > > + EXTRA_EXT_ATOMICS_GS, > > + EXTRA_EXT_SHADER_IMAGE_GS, > > EXTRA_EXT_ATOMICS_TESS, > > EXTRA_EXT_SHADER_IMAGE_TESS, > > + EXTRA_EXT_SSBO_GS, > > + EXTRA_EXT_FB_NO_ATTACH_GS, > > + EXTRA_EXT_ES_GS, > > }; > > > > #define NO_EXTRA NULL > > @@ -308,7 +311,7 @@ static const int > > extra_ARB_transform_feedback2_api_es3[] = { }; > > > > static const int > extra_ARB_uniform_buffer_object_and_geometry_shader[] = { > > - EXTRA_EXT_UBO_GS4, > > + EXTRA_EXT_UBO_GS, > > EXTRA_END > > }; > > > > @@ -343,12 +346,12 @@ static const int extra_EXT_texture_array_es3[] = > > { }; > > > > static const int > extra_ARB_shader_atomic_counters_and_geometry_shader[] = { > > - EXTRA_EXT_ATOMICS_GS4, > > + EXTRA_EXT_ATOMICS_GS, > > EXTRA_END > > }; > > > > static const int > extra_ARB_shader_image_load_store_and_geometry_shader[] = { > > - EXTRA_EXT_SHADER_IMAGE_GS4, > > + EXTRA_EXT_SHADER_IMAGE_GS, > > EXTRA_END > > }; > > > > @@ -375,6 +378,29 @@ static const int > extra_ARB_shader_storage_buffer_object_es31[] = { > > EXTRA_END > > }; > > > > +static const int > extra_ARB_shader_storage_buffer_object_and_geometry_shader[] = { > > + EXTRA_EXT_SSBO_GS, > > + EXTRA_END > > +}; > > + > > + > > +static const int > extra_ARB_framebuffer_no_attachments_and_geometry_shader[] = { > > + EXTRA_EXT_FB_NO_ATTACH_GS, > > + EXTRA_END > > +}; > > + > > +static const int extra_ARB_viewport_array_or_oes_geometry_shader[] = > { > > + EXT(ARB_viewport_array), > > + EXTRA_EXT_ES_GS, > > + EXTRA_END > > +}; > > + > > +static const int extra_ARB_gpu_shader5_or_oes_geometry_shader[] = { > > + EXT(ARB_gpu_shader5), > > + EXTRA_EXT_ES_GS, > > + EXTRA_END > > +}; > > + > > EXTRA_EXT(ARB_texture_cube_map); > > EXTRA_EXT(EXT_texture_array); > > EXTRA_EXT(NV_fog_distance); > > @@ -424,6 +450,7 @@ EXTRA_EXT(ARB_tessellation_shader); > > EXTRA_EXT(ARB_shader_subroutine); > > EXTRA_EXT(ARB_shader_storage_buffer_object); > > EXTRA_EXT(ARB_indirect_parameters); > > +EXTRA_EXT(OES_geometry_shader); > > > > static const int > > extra_ARB_color_buffer_float_or_glcore[] = { @@ -455,6 +482,12 @@ > > static const int extra_gl32_es3[] = { > > EXTRA_END, > > }; > > > > +static const int extra_version_32_OES_geometry_shader[] = { > > + EXTRA_VERSION_32, > > + EXT(OES_geometry_shader), > > Since you now have EXTRA_EXT_ES_GS, you should just use that instead of > EXT(OES_geometry_shader). > > With this fixed and the "EXTRA_EXT(OES_geometry_shader)" above > removed, this change is > > Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
Thanks, Ilia. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
