diff options
| -rw-r--r-- | src/compiler/glsl/lower_buffer_access.cpp | 1 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_buffer_access.h | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_shared_reference.cpp | 6 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_ubo_reference.cpp | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/compiler/glsl/lower_buffer_access.cpp b/src/compiler/glsl/lower_buffer_access.cpp index 69dc82bf261..51e65608c35 100644 --- a/src/compiler/glsl/lower_buffer_access.cpp +++ b/src/compiler/glsl/lower_buffer_access.cpp @@ -321,7 +321,6 @@ lower_buffer_access::is_dereferenced_thing_row_major(const ir_rvalue *deref) */ void lower_buffer_access::setup_buffer_access(void *mem_ctx, - ir_variable *var, ir_rvalue *deref, ir_rvalue **offset, unsigned *const_offset, diff --git a/src/compiler/glsl/lower_buffer_access.h b/src/compiler/glsl/lower_buffer_access.h index db9ac45ef10..a2e3e7d8284 100644 --- a/src/compiler/glsl/lower_buffer_access.h +++ b/src/compiler/glsl/lower_buffer_access.h @@ -54,7 +54,7 @@ public: bool is_dereferenced_thing_row_major(const ir_rvalue *deref); - void setup_buffer_access(void *mem_ctx, ir_variable *var, ir_rvalue *deref, + void setup_buffer_access(void *mem_ctx, ir_rvalue *deref, ir_rvalue **offset, unsigned *const_offset, bool *row_major, int *matrix_columns, const glsl_struct_field **struct_field, diff --git a/src/compiler/glsl/lower_shared_reference.cpp b/src/compiler/glsl/lower_shared_reference.cpp index 1702469fe65..091f4027320 100644 --- a/src/compiler/glsl/lower_shared_reference.cpp +++ b/src/compiler/glsl/lower_shared_reference.cpp @@ -140,7 +140,7 @@ lower_shared_reference_visitor::handle_rvalue(ir_rvalue **rvalue) assert(var->get_interface_type() == NULL); const enum glsl_interface_packing packing = GLSL_INTERFACE_PACKING_STD430; - setup_buffer_access(mem_ctx, var, deref, + setup_buffer_access(mem_ctx, deref, &offset, &const_offset, &row_major, &matrix_columns, NULL, packing); @@ -208,7 +208,7 @@ lower_shared_reference_visitor::handle_assignment(ir_assignment *ir) assert(var->get_interface_type() == NULL); const enum glsl_interface_packing packing = GLSL_INTERFACE_PACKING_STD430; - setup_buffer_access(mem_ctx, var, deref, + setup_buffer_access(mem_ctx, deref, &offset, &const_offset, &row_major, &matrix_columns, NULL, packing); @@ -368,7 +368,7 @@ lower_shared_reference_visitor::lower_shared_atomic_intrinsic(ir_call *ir) const enum glsl_interface_packing packing = GLSL_INTERFACE_PACKING_STD430; buffer_access_type = shared_atomic_access; - setup_buffer_access(mem_ctx, var, deref, + setup_buffer_access(mem_ctx, deref, &offset, &const_offset, &row_major, &matrix_columns, NULL, packing); diff --git a/src/compiler/glsl/lower_ubo_reference.cpp b/src/compiler/glsl/lower_ubo_reference.cpp index 083f43f93a3..1ed281c488a 100644 --- a/src/compiler/glsl/lower_ubo_reference.cpp +++ b/src/compiler/glsl/lower_ubo_reference.cpp @@ -320,7 +320,7 @@ lower_ubo_reference_visitor::setup_for_load_or_store(void *mem_ctx, *const_offset = ubo_var->Offset; this->struct_field = NULL; - setup_buffer_access(mem_ctx, var, deref, offset, const_offset, row_major, + setup_buffer_access(mem_ctx, deref, offset, const_offset, row_major, matrix_columns, &this->struct_field, packing); } |