Mesa (7.10): glsl: Mark 'in' variables at global scope as read-only

Ian Romanick idr at kemper.freedesktop.org
Sat Feb 5 00:14:06 UTC 2011


Module: Mesa
Branch: 7.10
Commit: 7bb3fe50c255c9365b8991f4856e94c487573361
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7bb3fe50c255c9365b8991f4856e94c487573361

Author: Chad Versace <chad.versace at intel.com>
Date:   Thu Jan 20 14:12:16 2011 -0800

glsl: Mark 'in' variables at global scope as read-only

Fixes Piglit tests:
spec/glsl-1.30/compiler/storage-qualifiers/static-write-centroid-in-01.frag
spec/glsl-1.30/compiler/storage-qualifiers/static-write-in-01.frag
spec/glsl-1.30/compiler/storage-qualifiers/static-write-in-02.frag
(cherry picked from commit 01a584d09350d2c726312e2c9e88c5dbc54bdb70)

---

 src/glsl/ast_to_hir.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index d6f3708..8e74879 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1812,7 +1812,6 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
       }
    }
 
-   /* FINISHME: Mark 'in' variables at global scope as read-only. */
    if (qual->flags.q.constant || qual->flags.q.attribute
        || qual->flags.q.uniform
        || (qual->flags.q.varying && (state->target == fragment_shader)))
@@ -2209,6 +2208,8 @@ ast_declarator_list::hir(exec_list *instructions,
 			     mode, var->name, extra);
 	 }
       } else if (var->mode == ir_var_in) {
+         var->read_only = true;
+
 	 if (state->target == vertex_shader) {
 	    bool error_emitted = false;
 




More information about the mesa-commit mailing list