diff options
Diffstat (limited to 'src/glsl/ast_to_hir.cpp')
| -rw-r--r-- | src/glsl/ast_to_hir.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp index 15e1afc4dd..d615b30e7d 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) { @@ -2636,8 +2636,7 @@ ast_jump_statement::hir(exec_list *instructions, state->current_function->function_name()); } - ir_expression *const ret = (ir_expression *) - opt_return_value->hir(instructions, state); + ir_rvalue *const ret = opt_return_value->hir(instructions, state); assert(ret != NULL); /* Implicit conversions are not allowed for return values. */ |