fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Remove the context parameter from brw_texture_offset

Browse source 
It wasn't really being used anyway.  We used it to assert that gpu_shader5
is supported in the back-end but that should be caught by the front-end.

Signed-off-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Jason Ekstrand 2015-04-14 14:23:40 -07:00
parent 8a41cd2407
commit ceb6e5eebe
5 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
View file

@ -1707,7 +1707,7 @@ fs_visitor::nir_emit_texture(nir_tex_instr *instr)
for (unsigned i = 0; i < 3; i++) {
if (instr->const_offset[i] != 0) {
assert(offset_components == 0);
tex_offset = fs_reg(brw_texture_offset(ctx, instr->const_offset, 3));
tex_offset = fs_reg(brw_texture_offset(instr->const_offset, 3));
break;
}
}

2
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
View file

@ -2351,7 +2351,7 @@ fs_visitor::visit(ir_texture *ir)
* offset, and a non-constant offset.
*/
offset_value =
fs_reg(brw_texture_offset(ctx, const_offset->value.i,
fs_reg(brw_texture_offset(const_offset->value.i,
const_offset->type->vector_elements));
} else {
ir->offset->accept(this);

8
src/mesa/drivers/dri/i965/brw_shader.cpp
View file

@ -393,14 +393,8 @@ brw_math_function(enum opcode op)
}
uint32_t
brw_texture_offset(struct gl_context *ctx, int *offsets,
unsigned num_components)
brw_texture_offset(int *offsets, unsigned num_components)
{
/* If the driver does not support GL_ARB_gpu_shader5, the offset
* must be constant.
*/
assert(offsets != NULL || ctx->Extensions.ARB_gpu_shader5);
if (!offsets) return 0; /* nonconstant offset; caller will handle it. */
/* Combine all three offsets into a single unsigned dword:

3
src/mesa/drivers/dri/i965/brw_shader.h
View file

@ -206,8 +206,7 @@ public:
virtual void invalidate_live_intervals() = 0;
};
uint32_t brw_texture_offset(struct gl_context *ctx, int *offsets,
unsigned num_components);
uint32_t brw_texture_offset(int *offsets, unsigned num_components);
#endif /* __cplusplus */

2
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
View file

@ -2630,7 +2630,7 @@ vec4_visitor::visit(ir_texture *ir)
if (ir->offset != NULL && !has_nonconstant_offset) {
inst->offset =
brw_texture_offset(ctx, ir->offset->as_constant()->value.i,
brw_texture_offset(ir->offset->as_constant()->value.i,
ir->offset->type->vector_elements);
}