From: Chad Versace <chad.versace@intel.com>
Date: Sat, 23 Oct 2010 17:40:40 +0000 (-0700)
Subject: glsl: Fix ast-to-hir for ARB_fragment_coord_conventions
X-Git-Tag: mesa-7.10~982
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e006273840282e06a08655553821ef8176b2d9c;p=platform%2Fupstream%2Fmesa.git

glsl: Fix ast-to-hir for ARB_fragment_coord_conventions

Function ast_declarator_list::hir(), when processing keywords added by
extension ARB_fragment_coord_conventions, made the mistake of checking only if
the extension was __supported by the driver__. The correct behavior is to check
if the extensi0n is __enabled in the parse state__.

NOTE: this is a candidate for the 7.9 branch.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 15e1afc..4540e98 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2210,7 +2210,7 @@ ast_declarator_list::hir(exec_list *instructions,
 	    earlier->type = var->type;
 	    delete var;
 	    var = NULL;
-	 } else if (state->extensions->ARB_fragment_coord_conventions
+	 } else if (state->ARB_fragment_coord_conventions_enable
 		    && strcmp(var->name, "gl_FragCoord") == 0
 		    && earlier->type == var->type
 		    && earlier->mode == var->mode) {