[Mesa-dev] [PATCH v2 2/6] glapi: add GL_OES_geometry_shader extension

[Lofstedt, Marta]

> -----Original Message-----
> From: mesa-dev [mailto:mesa-dev-bounces at lists.freedesktop.org] On
> Behalf Of Emil Velikov
> Sent: Friday, November 27, 2015 7:23 PM
> To: Marta Lofstedt
> Cc: ML mesa-dev
> Subject: Re: [Mesa-dev] [PATCH v2 2/6] glapi: add
> GL_OES_geometry_shader extension
> 
> Hello Marta,
> 
> On 27 November 2015 at 14:31, Marta Lofstedt
> <marta.lofstedt at linux.intel.com> wrote:
> > From: Marta Lofstedt <marta.lofstedt at intel.com>
> >
> > Add xml definitions for the GL_OES_geometry_shader extension and
> > expose the extension for OpenGL ES 3.1.
> >
> > Signed-off-by: Marta Lofstedt <marta.lofstedt at linux.intel.com>
> > ---
> >  src/mapi/glapi/gen/apiexec.py           |  2 +-
> >  src/mapi/glapi/gen/es_EXT.xml           | 43
> +++++++++++++++++++++++++++++++++
> >  src/mesa/main/extensions_table.h        |  1 +
> >  src/mesa/main/mtypes.h                  |  1 +
> >  src/mesa/main/tests/dispatch_sanity.cpp |  3 +++
> >  5 files changed, 49 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/mapi/glapi/gen/apiexec.py
> > b/src/mapi/glapi/gen/apiexec.py index 58ec08b..fa046fa 100644
> > --- a/src/mapi/glapi/gen/apiexec.py
> > +++ b/src/mapi/glapi/gen/apiexec.py
> > @@ -72,7 +72,7 @@ functions = {
> >
> >      # OpenGL 3.2 / GL_ARB_geometry_shader4.  Mesa does not support
> >      # GL_ARB_geometry_shader4, so OpenGL 3.2 is required.
> > -    "FramebufferTexture": exec_info(core=32),
> > +    "FramebufferTexture": exec_info(core=32, es2=31),
> >
> Please update the comment as well.
> 
> >      # OpenGL 4.0 / GL_ARB_shader_subroutines. Mesa only exposes this
> >      # extension with core profile.
> > diff --git a/src/mapi/glapi/gen/es_EXT.xml
> > b/src/mapi/glapi/gen/es_EXT.xml index 577d825..f6c49c2 100644
> > --- a/src/mapi/glapi/gen/es_EXT.xml
> > +++ b/src/mapi/glapi/gen/es_EXT.xml
> > @@ -940,4 +940,47 @@
> >      </function>
> >
> >  </category>
> > +
> > +<!-- 175. GL_OES_geometry_shader -->
> > +<category name="GL_OES_geometry_shader" number="175">
> > +    <enum name="GEOMETRY_SHADER_OES"
> value="0x8DD9"/>
> > +    <enum name="GEOMETRY_SHADER_BIT_OES"
> value="0x00000004"/>
> > +    <enum name="GEOMETRY_LINKED_VERTICES_OUT_OES"
> value="0x8916"/>
> > +    <enum name="GEOMETRY_LINKED_INPUT_TYPE_OES"
> value="0x8917"/>
> > +    <enum name="GEOMETRY_LINKED_OUTPUT_TYPE_OES"
> value="0x8918"/>
> > +    <enum name="GEOMETRY_SHADER_INVOCATIONS_OES"
> value="0x887F"/>
> > +    <enum name="LAYER_PROVOKING_VERTEX_OES"
> value="0x825E"/>
> > +    <enum name="MAX_GEOMETRY_UNIFORM_BLOCKS_OES"
> value="0x8A2C"/>
> > +    <enum
> name="MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_OES"
> value="0x8A32"/>
> > +    <enum name="MAX_GEOMETRY_INPUT_COMPONENTS_OES"
> value="0x9123"/>
> > +    <enum name="MAX_GEOMETRY_OUTPUT_COMPONENTS_OES"
> value="0x9124"/>
> > +    <enum name="MAX_GEOMETRY_OUTPUT_VERTICES_OES"
> value="0x8DE0"/>
> > +    <enum
> name="MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_OES"
> value="0x8DE1"/>
> > +    <enum name="MAX_GEOMETRY_SHADER_INVOCATIONS_OES"
> value="0x8E5A"/>
> > +    <enum name="MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_OES"
> value="0x8C29"/>
> > +    <enum name="MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_OES"
> value="0x92CF"/>
> > +    <enum name="MAX_GEOMETRY_ATOMIC_COUNTERS_OES"
> value="0x92D5"/>
> > +    <enum name="MAX_GEOMETRY_IMAGE_UNIFORMS_OES"
> value="0x90CD"/>
> > +    <enum name="MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_OES"
> value="0x90D7"/>
> > +    <enum name="FIRST_VERTEX_CONVENTION_OES"
> value="0x8E4D"/>
> > +    <enum name="LAST_VERTEX_CONVENTION_OES"
> value="0x8E4E"/>
> > +    <enum name="UNDEFINED_VERTEX_OES"
> value="0x8260"/>
> > +    <enum name="PRIMITIVES_GENERATED_OES"
> value="0x8C87"/>
> > +    <enum name="LINES_ADJACENCY_OES"                             value="0xA"/>
> > +    <enum name="LINE_STRIP_ADJACENCY_OES"
> value="0xB"/>
> > +    <enum name="TRIANGLES_ADJACENCY_OES"
> value="0xC"/>
> > +    <enum name="TRIANGLE_STRIP_ADJACENCY_OES"
> value="0xD"/>
> > +    <enum name="FRAMEBUFFER_DEFAULT_LAYERS_OES"
> value="0x9312"/>
> > +    <enum name="MAX_FRAMEBUFFER_LAYERS_OES"
> value="0x9317"/>
> > +    <enum name="FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_OES"
> value="0x8DA8"/>
> > +    <enum name="FRAMEBUFFER_ATTACHMENT_LAYERED_OES"
> value="0x8DA7"/>
> > +    <enum name="REFERENCED_BY_GEOMETRY_SHADER_OES"
> value="0x9309"/>
> > +
> Wondering if Eric's recent patches don't make these obsolete. Haven't look
> closely at them yet, have you ?

No, I haven't looked to closely at them either. Do you think I should wait with this util Erics stuff has landed?

> 
> Cheers,
> Emil
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev