Mesa (master): glsl: Add missing spec quote about atomic counter in structs

Timothy Arceri tarceri at kemper.freedesktop.org
Tue Aug 11 11:07:39 UTC 2015


Module: Mesa
Branch: master
Commit: fe55ab2d12202236ba5bf9beae09803dfe97a7ac
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe55ab2d12202236ba5bf9beae09803dfe97a7ac

Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date:   Sun Aug  9 14:44:30 2015 +1000

glsl: Add missing spec quote about atomic counter in structs

Reviewed-by: Thomas Helland <thomashelland90 at gmail.com>

---

 src/glsl/ast_to_hir.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 68f71c6..06cd6a5 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -5631,10 +5631,10 @@ ast_process_structure_or_interface_block(exec_list *instructions,
          }
 
          if (field_type->contains_atomic()) {
-            /* FINISHME: Add a spec quotation here once updated spec
-             * FINISHME: language is available.  See Khronos bug #10903
-             * FINISHME: on whether atomic counters are allowed in
-             * FINISHME: structures.
+            /* From section 4.1.7.3 of the GLSL 4.40 spec:
+             *
+             *    "Members of structures cannot be declared as atomic counter
+             *     types."
              */
             YYLTYPE loc = decl_list->get_location();
             _mesa_glsl_error(&loc, state, "atomic counter in structure, "




More information about the mesa-commit mailing list