Mesa (7.9): glsl: Fix ast-to-hir for ARB_fragment_coord_conventions
Ian Romanick
idr at kemper.freedesktop.org
Tue Dec 14 21:13:05 UTC 2010
Module: Mesa
Branch: 7.9
Commit: 554dbaa8a081258d2e3fbbe267cdf1dba86d6045
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=554dbaa8a081258d2e3fbbe267cdf1dba86d6045
Author: Chad Versace <chad.versace at intel.com>
Date: Sat Oct 23 10:40:40 2010 -0700
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 at intel.com>
(cherry picked from commit 6e006273840282e06a08655553821ef8176b2d9c)
---
src/glsl/ast_to_hir.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 0cbb431..6029b6d 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2021,7 +2021,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) {
More information about the mesa-commit
mailing list