| Revisión | f2c1d7acd0ca56a020a982425523ec8f7fade966 (tree) |
|---|---|
| Tiempo | 2019-01-31 21:05:54 |
| Autor | Timothy Arceri <tarceri@itsq...> |
| Commiter | Emil Velikov |
glsl: Copy function out to temp if we don't directly ref a variable
Otherwise we can end up with IR that looks like this:
When we really need:
The GLSL IR function inlining code seemed to produce correct code
even without this but we need the correct IR for GLSL IR -> NIR to
be able to understand whats going on.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 76c27e47b90647df047e785d6b3ab5d0d979a1ee)
Nominated-by: Matt Turner <mattst88@gmail.com>
src/compiler/glsl/ast_function.cpp (diff)| @@ -402,7 +402,8 @@ fix_parameter(void *mem_ctx, ir_rvalue *actual, const glsl_type *formal_type, | ||
| 402 | 402 | * nothing needs to be done to fix the parameter. |
| 403 | 403 | */ |
| 404 | 404 | if (formal_type == actual->type |
| 405 | - && (expr == NULL || expr->operation != ir_binop_vector_extract)) | |
| 405 | + && (expr == NULL || expr->operation != ir_binop_vector_extract) | |
| 406 | + && actual->as_dereference_variable()) | |
| 406 | 407 | return; |
| 407 | 408 | |
| 408 | 409 | /* An array index could also be an out variable so we need to make a copy |
| @@ -456,7 +457,7 @@ fix_parameter(void *mem_ctx, ir_rvalue *actual, const glsl_type *formal_type, | ||
| 456 | 457 | ir_dereference_variable *const deref_tmp_1 = |
| 457 | 458 | new(mem_ctx) ir_dereference_variable(tmp); |
| 458 | 459 | ir_assignment *const assignment = |
| 459 | - new(mem_ctx) ir_assignment(deref_tmp_1, actual); | |
| 460 | + new(mem_ctx) ir_assignment(deref_tmp_1, actual->clone(mem_ctx, NULL)); | |
| 460 | 461 | before_instructions->push_tail(assignment); |
| 461 | 462 | } |
| 462 | 463 |
Android-x86
Fork