From 53cbba83eb66b3bcacbfc467af495b86d63dad68 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 2 Mar 2022 10:53:46 -0500 Subject: [PATCH] glsl: store OES/EXT point_size extension enablement to shader struct Reviewed-by: Ilia Mirkin Part-of: --- src/compiler/glsl/glsl_parser_extras.cpp | 2 ++ src/mesa/main/shader_types.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 3a4a046dced..cf21902324c 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -1831,6 +1831,7 @@ set_shader_inout_layout(struct gl_shader *shader, } break; case MESA_SHADER_TESS_EVAL: + shader->OES_tessellation_point_size_enable = state->OES_tessellation_point_size_enable || state->EXT_tessellation_point_size_enable; shader->info.TessEval._PrimitiveMode = TESS_PRIMITIVE_UNSPECIFIED; if (state->in_qualifier->flags.q.prim_type) { switch (state->in_qualifier->prim_type) { @@ -1859,6 +1860,7 @@ set_shader_inout_layout(struct gl_shader *shader, shader->info.TessEval.PointMode = state->in_qualifier->point_mode; break; case MESA_SHADER_GEOMETRY: + shader->OES_geometry_point_size_enable = state->OES_geometry_point_size_enable || state->EXT_geometry_point_size_enable; shader->info.Geom.VerticesOut = -1; if (state->out_qualifier->flags.q.max_vertices) { unsigned qual_max_vertices; diff --git a/src/mesa/main/shader_types.h b/src/mesa/main/shader_types.h index f2f1656ba30..0df22fa9c84 100644 --- a/src/mesa/main/shader_types.h +++ b/src/mesa/main/shader_types.h @@ -185,6 +185,8 @@ struct gl_shader bool EarlyFragmentTests; bool ARB_fragment_coord_conventions_enable; + bool OES_geometry_point_size_enable; + bool OES_tessellation_point_size_enable; bool redeclares_gl_fragcoord; bool uses_gl_fragcoord;