Mesa (main): glsl: store OES/EXT point_size extension enablement to shader struct

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Mar 9 05:41:13 UTC 2022


Module: Mesa
Branch: main
Commit: 53cbba83eb66b3bcacbfc467af495b86d63dad68
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=53cbba83eb66b3bcacbfc467af495b86d63dad68

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Mar  2 10:53:46 2022 -0500

glsl: store OES/EXT point_size extension enablement to shader struct

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15228>

---

 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;



More information about the mesa-commit mailing list