fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-03 07:10:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Use native integer uniforms when the new VS backend is in use.

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2011-08-19 11:51:43 -07:00
parent 2f82c33dee
commit 55b7fbb70f
6 changed files with 13 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -250,6 +250,12 @@ GLboolean brwCreateContext( int api,
brw->new_vs_backend = (getenv("INTEL_NEW_VS") != NULL);
/* If we're using the new shader backend, we require integer uniforms
* stored as actual integers.
*/
if (brw->new_vs_backend)
ctx->Const.NativeIntegers = true;
return GL_TRUE;
}

2
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -321,9 +321,7 @@ struct brw_vs_prog_data {
GLuint urb_entry_size;
const float *param[MAX_UNIFORMS * 4]; /* should be: BRW_MAX_CURBE */
enum param_conversion param_convert[MAX_UNIFORMS * 4];
const float *pull_param[MAX_UNIFORMS * 4];
enum param_conversion pull_param_convert[MAX_UNIFORMS * 4];
bool uses_new_param_layout;
};

3
src/mesa/drivers/dri/i965/brw_curbe.c
View file

@ -246,8 +246,7 @@ static void prepare_constant_buffer(struct brw_context *brw)
if (brw->vs.prog_data->uses_new_param_layout) {
for (i = 0; i < brw->vs.prog_data->nr_params; i++) {
buf[offset + i] = convert_param(brw->vs.prog_data->param_convert[i],
brw->vs.prog_data->param[i]);
buf[offset + i] = *brw->vs.prog_data->param[i];
}
} else {
/* Load the subset of push constants that will get used when

1
src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
View file

@ -120,7 +120,6 @@ vec4_visitor::setup_uniforms(int reg)
unsigned int slot = this->uniforms * 4 + i;
c->prog_data.param[slot] = NULL;
c->prog_data.param_convert[slot] = PARAM_CONVERT_ZERO;
}
this->uniforms++;

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

@ -362,32 +362,14 @@ vec4_visitor::setup_uniform_values(int loc, const glsl_type *type)
case GLSL_TYPE_INT:
case GLSL_TYPE_BOOL:
for (unsigned int i = 0; i < type->vector_elements; i++) {
int slot = this->uniforms * 4 + i;
switch (type->base_type) {
case GLSL_TYPE_FLOAT:
c->prog_data.param_convert[slot] = PARAM_NO_CONVERT;
break;
case GLSL_TYPE_UINT:
c->prog_data.param_convert[slot] = PARAM_CONVERT_F2U;
break;
case GLSL_TYPE_INT:
c->prog_data.param_convert[slot] = PARAM_CONVERT_F2I;
break;
case GLSL_TYPE_BOOL:
c->prog_data.param_convert[slot] = PARAM_CONVERT_F2B;
break;
default:
assert(!"not reached");
c->prog_data.param_convert[slot] = PARAM_NO_CONVERT;
break;
}
c->prog_data.param[slot] = &values[i];
c->prog_data.param[this->uniforms * 4 + i] = &values[i];
}
/* Set up pad elements to get things aligned to a vec4 boundary. */
for (unsigned int i = type->vector_elements; i < 4; i++) {
c->prog_data.param_convert[this->uniforms * 4 + i] =
PARAM_CONVERT_ZERO;
c->prog_data.param[this->uniforms * 4 + i] = NULL;
static float zero = 0;
c->prog_data.param[this->uniforms * 4 + i] = &zero;
}
this->uniform_size[this->uniforms] = type->vector_elements;
@ -448,7 +430,6 @@ vec4_visitor::setup_builtin_uniform_values(ir_variable *ir)
last_swiz = swiz;
c->prog_data.param[this->uniforms * 4 + j] = &values[swiz];
c->prog_data.param_convert[this->uniforms * 4 + j] = PARAM_NO_CONVERT;
if (swiz <= last_swiz)
this->uniform_size[this->uniforms]++;
}

3
src/mesa/drivers/dri/i965/gen6_vs_state.c
View file

@ -83,8 +83,7 @@ gen6_prepare_vs_push_constants(struct brw_context *brw)
if (brw->vs.prog_data->uses_new_param_layout) {
for (i = 0; i < brw->vs.prog_data->nr_params; i++) {
*param = convert_param(brw->vs.prog_data->param_convert[i],
brw->vs.prog_data->param[i]);
*param = *brw->vs.prog_data->param[i];
param++;
}
params_uploaded += brw->vs.prog_data->nr_params / 4;