diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-28 14:48:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-28 14:48:08 +0200 |
| commit | 6f4feafd4d22beaabfb0202e66b0dea9047ee084 (patch) | |
| tree | a317af068ea091dc6d2142802ab316b941682544 /mesalib/src/glsl/ast_to_hir.cpp | |
| parent | d662d461634660f5c0f3998b5eb7d7ed3bd5a25f (diff) | |
| download | vcxsrv-6f4feafd4d22beaabfb0202e66b0dea9047ee084.tar.gz vcxsrv-6f4feafd4d22beaabfb0202e66b0dea9047ee084.tar.bz2 vcxsrv-6f4feafd4d22beaabfb0202e66b0dea9047ee084.zip | |
mesa git update 28 okt 2011
Diffstat (limited to 'mesalib/src/glsl/ast_to_hir.cpp')
| -rw-r--r-- | mesalib/src/glsl/ast_to_hir.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp index 70afb67df..fa6206e5e 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -1962,11 +1962,13 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual, } if (qual->flags.q.flat) - var->interpolation = ir_var_flat; + var->interpolation = INTERP_QUALIFIER_FLAT; else if (qual->flags.q.noperspective) - var->interpolation = ir_var_noperspective; + var->interpolation = INTERP_QUALIFIER_NOPERSPECTIVE; + else if (qual->flags.q.smooth) + var->interpolation = INTERP_QUALIFIER_SMOOTH; else - var->interpolation = ir_var_smooth; + var->interpolation = INTERP_QUALIFIER_NONE; var->pixel_center_integer = qual->flags.q.pixel_center_integer; var->origin_upper_left = qual->flags.q.origin_upper_left; @@ -2630,7 +2632,7 @@ ast_declarator_list::hir(exec_list *instructions, && state->current_function == NULL && var->type->is_integer() && var->mode == ir_var_out - && var->interpolation != ir_var_flat) { + && var->interpolation != INTERP_QUALIFIER_FLAT) { _mesa_glsl_error(&loc, state, "If a vertex output is an integer, " "then it must be qualified with 'flat'"); |