diff options
| author | Ian Romanick <[email protected]> | 2016-05-23 13:31:29 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2016-08-26 15:03:14 -0700 |
| commit | 1a72fbf9e6743368dc8e7664adf095af8ec5b6d8 (patch) | |
| tree | a68e16054e34d6d92552b06002ee8be9fafae0c7 /src/compiler/glsl | |
| parent | 658e90f9a8c0c68e0bee5007cf3f654cc95188b6 (diff) | |
mesa: Allow GL_EXT_geometry_shader and GL_EXT_geometry_point_size
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/compiler/glsl')
| -rw-r--r-- | src/compiler/glsl/builtin_variables.cpp | 3 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.h | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index cb5f7301c51..d4ea6607b46 100644 --- a/src/compiler/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp @@ -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 || diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 2337eaea248..b5c5fdc574c 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -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), diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index f8136092494..7092281a2b4 100644 --- a/src/compiler/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h @@ -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; |