[Mesa-stable] [PATCH] glsl: Don't emit empty declaration warning for a struct specifier

Ian Romanick idr at freedesktop.org
Wed Nov 27 12:50:32 PST 2013


From: Ian Romanick <ian.d.romanick at intel.com>

The intention is that things like

   int;

will generate a warning.  However, we were also accidentally emitting
the same warning for things like

  struct Foo { int x; };

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68838
Cc: Aras Pranckevicius <aras at unity3d.com>
Cc: "9.2 10.0" <mesa-stable at lists.freedesktop.org>
---
I think it's okay for this to wait until 10.0.1.  It's a fairly minor
issue, though it is annoying...

 src/glsl/ast_to_hir.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 43cf497..37be1cb 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2940,7 +2940,7 @@ ast_declarator_list::hir(exec_list *instructions,
                                precision_names[this->type->qualifier.precision],
                                type_name);
          }
-      } else {
+      } else if (this->type->specifier->structure == NULL) {
          _mesa_glsl_warning(&loc, state, "empty declaration");
       }
    }
-- 
1.8.1.4



More information about the mesa-stable mailing list