From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 4 Dec 2014 08:42:11 +0000 (+0200)
Subject: glsl: Forbid opaque variables as operands of the ternary operator.
X-Git-Tag: upstream/17.1.0~19055
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f64edfdc44d955adfe3e99154559e7935a2efd45;p=platform%2Fupstream%2Fmesa.git

glsl: Forbid opaque variables as operands of the ternary operator.

Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 18b82e3..da063d5 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -1558,6 +1558,18 @@ ast_expression::do_hir(exec_list *instructions,
          error_emitted = true;
       }
 
+      /* From section 4.1.7 of the GLSL 4.50 spec (Opaque Types):
+       *
+       *  "Except for array indexing, structure member selection, and
+       *   parentheses, opaque variables are not allowed to be operands in
+       *   expressions; such use results in a compile-time error."
+       */
+      if (type->contains_opaque()) {
+         _mesa_glsl_error(&loc, state, "opaque variables cannot be operands "
+                          "of the ?: operator");
+         error_emitted = true;
+      }
+
       ir_constant *cond_val = op[0]->constant_expression_value();
 
       if (then_instructions.is_empty()