fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 06:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Allow GL_EXT_geometry_shader and GL_EXT_geometry_point_size

Browse source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick 2016-05-23 13:31:29 -07:00
parent 658e90f9a8
commit 1a72fbf9e6
6 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/compiler/glsl/builtin_variables.cpp
View file

@ -1273,7 +1273,8 @@ builtin_variable_generator::generate_varyings()
if (!state->es_shader ||
state->stage == MESA_SHADER_VERTEX ||
(state->stage == MESA_SHADER_GEOMETRY &&
state->OES_geometry_point_size_enable) ||
(state->OES_geometry_point_size_enable ||
state->EXT_geometry_point_size_enable)) ||
((state->stage == MESA_SHADER_TESS_CTRL ||
state->stage == MESA_SHADER_TESS_EVAL) &&
(state->OES_tessellation_point_size_enable ||

2
src/compiler/glsl/glsl_parser_extras.cpp
View file

@ -652,6 +652,8 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
EXT(EXT_blend_func_extended),
EXT(EXT_draw_buffers),
EXT(EXT_clip_cull_distance),
EXT(EXT_geometry_point_size),
EXT(EXT_geometry_shader),
EXT(EXT_gpu_shader5),
EXT(EXT_separate_shader_objects),
EXT(EXT_shader_framebuffer_fetch),

8
src/compiler/glsl/glsl_parser_extras.h
View file

@ -277,6 +277,7 @@ struct _mesa_glsl_parse_state {
return OES_shader_io_blocks_enable ||
EXT_shader_io_blocks_enable ||
OES_geometry_shader_enable ||
EXT_geometry_shader_enable ||
OES_tessellation_shader_enable ||
EXT_tessellation_shader_enable ||
@ -285,7 +286,8 @@ struct _mesa_glsl_parse_state {
bool has_geometry_shader() const
{
return OES_geometry_shader_enable || is_version(150, 320);
return OES_geometry_shader_enable || EXT_geometry_shader_enable ||
is_version(150, 320);
}
bool has_tessellation_shader() const
@ -701,6 +703,10 @@ struct _mesa_glsl_parse_state {
bool EXT_clip_cull_distance_warn;
bool EXT_draw_buffers_enable;
bool EXT_draw_buffers_warn;
bool EXT_geometry_point_size_enable;
bool EXT_geometry_point_size_warn;
bool EXT_geometry_shader_enable;
bool EXT_geometry_shader_warn;
bool EXT_gpu_shader5_enable;
bool EXT_gpu_shader5_warn;
bool EXT_separate_shader_objects_enable;

10
src/mapi/glapi/gen/es_EXT.xml
View file

@ -881,6 +881,16 @@
</category>
<category name="GL_EXT_geometry_shader" number="177">
<!-- The rest of the bits for this are below in OES_geometry_shader. -->
<function name="FramebufferTextureEXT" alias="FramebufferTexture" es2="3.1">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="texture" type="GLuint"/>
<param name="level" type="GLint"/>
</function>
</category>
<category name="GL_EXT_texture_border_clamp" number="182">
<!-- The *TexParameter* functions are added in EXT_texture_integer -->

2
src/mesa/main/extensions_table.h
View file

@ -209,6 +209,8 @@ EXT(EXT_framebuffer_multisample , EXT_framebuffer_multisample
EXT(EXT_framebuffer_multisample_blit_scaled , EXT_framebuffer_multisample_blit_scaled, GLL, GLC, x , x , 2011)
EXT(EXT_framebuffer_object , dummy_true , GLL, x , x , x , 2000)
EXT(EXT_framebuffer_sRGB , EXT_framebuffer_sRGB , GLL, GLC, x , x , 1998)
EXT(EXT_geometry_point_size , OES_geometry_shader , x , x , x , 31, 2015)
EXT(EXT_geometry_shader , OES_geometry_shader , x , x , x , 31, 2015)
EXT(EXT_gpu_program_parameters , EXT_gpu_program_parameters , GLL, x , x , x , 2006)
EXT(EXT_gpu_shader4 , EXT_gpu_shader4 , GLL, GLC, x , x , 2006)
EXT(EXT_gpu_shader5 , ARB_gpu_shader5 , x , x , x , 31, 2014)

4
src/mesa/main/tests/dispatch_sanity.cpp
View file

@ -2600,6 +2600,10 @@ const struct function gles31_functions_possible[] = {
/* GL_OES_geometry_shader */
{ "glFramebufferTextureOES", 31, -1},
/* GL_EXT_geometry_shader */
// We check for the aliased OES version above
// { "glFramebufferTextureEXT", 31, -1},
/* GL_OES_tessellation_shader */
{ "glPatchParameteriOES", 31, -1 },