AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Rename setup_vector_uniform_values to setup_vec4_uniform_value

Browse Source 
The new name more accurately represents what it does: Set up a single vec4
uniform value.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2015-08-19 09:56:57 -07:00
parent 0ab29751b6
commit 8d8b8f5854
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/i965/brw_fs.cpp
+2 -1
View File
@@ -943,7 +943,8 @@ fs_visitor::import_uniforms(fs_visitor *v)
}
void
fs_visitor::setup_vector_uniform_values(const gl_constant_value *values, unsigned n)
fs_visitor::setup_vec4_uniform_value(const gl_constant_value *values,
unsigned n)
{
static const gl_constant_value zero = { 0 };
src/mesa/drivers/dri/i965/brw_fs.h
+2 -2
View File
@@ -291,8 +291,8 @@ public:
struct brw_reg interp_reg(int location, int channel);
virtual void setup_vector_uniform_values(const gl_constant_value *values,
unsigned n);
virtual void setup_vec4_uniform_value(const gl_constant_value *values,
unsigned n);
int implied_mrf_writes(fs_inst *inst);
src/mesa/drivers/dri/i965/brw_shader.cpp
+6 -6
View File
@@ -1431,17 +1431,17 @@ backend_shader::setup_image_uniform_values(const gl_uniform_storage *storage)
/* Upload the brw_image_param structure. The order is expected to match
* the BRW_IMAGE_PARAM_*_OFFSET defines.
*/
setup_vector_uniform_values(
setup_vec4_uniform_value(
(const gl_constant_value *)&param->surface_idx, 1);
setup_vector_uniform_values(
setup_vec4_uniform_value(
(const gl_constant_value *)param->offset, 2);
setup_vector_uniform_values(
setup_vec4_uniform_value(
(const gl_constant_value *)param->size, 3);
setup_vector_uniform_values(
setup_vec4_uniform_value(
(const gl_constant_value *)param->stride, 4);
setup_vector_uniform_values(
setup_vec4_uniform_value(
(const gl_constant_value *)param->tiling, 3);
setup_vector_uniform_values(
setup_vec4_uniform_value(
(const gl_constant_value *)param->swizzling, 2);
brw_mark_surface_used(
src/mesa/drivers/dri/i965/brw_shader.h
+2 -2
View File
@@ -270,8 +270,8 @@ public:
virtual void invalidate_live_intervals() = 0;
virtual void setup_vector_uniform_values(const gl_constant_value *values,
unsigned n) = 0;
virtual void setup_vec4_uniform_value(const gl_constant_value *values,
unsigned n) = 0;
void setup_image_uniform_values(const gl_uniform_storage *storage);
};
src/mesa/drivers/dri/i965/brw_vec4.h
+2 -2
View File
@@ -177,8 +177,8 @@ public:
void fail(const char *msg, ...);
void setup_uniform_clipplane_values(gl_clip_plane *clip_planes);
virtual void setup_vector_uniform_values(const gl_constant_value *values,
unsigned n);
virtual void setup_vec4_uniform_value(const gl_constant_value *values,
unsigned n);
void setup_uniform_values(ir_variable *ir);
void setup_builtin_uniform_values(ir_variable *ir);
int setup_uniforms(int payload_reg);
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
+4 -4
View File
@@ -696,8 +696,8 @@ dst_reg::dst_reg(class vec4_visitor *v, const struct glsl_type *type)
}
void
vec4_visitor::setup_vector_uniform_values(const gl_constant_value *values,
unsigned n)
vec4_visitor::setup_vec4_uniform_value(const gl_constant_value *values,
unsigned n)
{
static const gl_constant_value zero = { 0 };
@@ -744,8 +744,8 @@ vec4_visitor::setup_uniform_values(ir_variable *ir)
const unsigned vector_size = storage->type->vector_elements;
for (unsigned s = 0; s < vector_count; s++)
setup_vector_uniform_values(&storage->storage[s * vector_size],
vector_size);
setup_vec4_uniform_value(&storage->storage[s * vector_size],
vector_size);
}
}