On Wed, Aug 7, 2013 at 10:31 AM, Paul Berry <stereotype...@gmail.com> wrote:
> GLSL 1.50 incorporates the functionality of the
> ARB_fragment_coord_conventions extension, so we need to make this
> functionality available even if the extension isn't enabled.
> ---
> src/glsl/ast_to_hir.cpp | 3 ++-
> src/glsl/glsl_parser.yy | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
> index 482ab3c..bfdf8e3 100644
> --- a/src/glsl/ast_to_hir.cpp
> +++ b/src/glsl/ast_to_hir.cpp
> @@ -2332,7 +2332,8 @@ get_variable_being_redeclared(ir_variable *var,
> ast_declaration *decl,
> earlier->type = var->type;
> delete var;
> var = NULL;
> - } else if (state->ARB_fragment_coord_conventions_enable
> + } else if ((state->ARB_fragment_coord_conventions_enable ||
> + state->is_version(150, 0))
> && strcmp(var->name, "gl_FragCoord") == 0
> && earlier->type == var->type
> && earlier->mode == var->mode) {
> diff --git a/src/glsl/glsl_parser.yy b/src/glsl/glsl_parser.yy
> index a847d2a..e3a57ea 100644
> --- a/src/glsl/glsl_parser.yy
> +++ b/src/glsl/glsl_parser.yy
> @@ -1158,7 +1158,8 @@ layout_qualifier_id:
> memset(& $$, 0, sizeof($$));
>
> /* Layout qualifiers for ARB_fragment_coord_conventions. */
> - if (!$$.flags.i && state->ARB_fragment_coord_conventions_enable) {
> + if (!$$.flags.i && (state->ARB_fragment_coord_conventions_enable ||
> + state->is_version(150, 0))) {
> if (strcmp($1, "origin_upper_left") == 0) {
> $$.flags.q.origin_upper_left = 1;
> } else if (strcmp($1, "pixel_center_integer") == 0) {
> --
> 1.8.3.4
I looked through the other uses of
ARB_fragment_coord_conventions_enable and no others looked like they
needed to be updated.
Reviewed-by: Matt Turner <matts...@gmail.com>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
