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

r300: fixup vertex attributes ordering

Browse Source 
Always allocate the vertex program input registers in the same order as the vertex attributes are passed in vertex arrays.
This commit is contained in:
Maciej Cencora
2009-05-27 22:17:31 +02:00
committed by Dave Airlie
parent ab60a44331
commit a27b689d08
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/r300/r300_vertprog.c
+10 -17
View File
@@ -215,21 +215,8 @@ static void vp_dump_inputs(struct r300_vertex_program *vp, char *caller)
static unsigned long t_src_index(struct r300_vertex_program *vp,
struct prog_src_register *src)
{
int i;
int max_reg = -1;
if (src->File == PROGRAM_INPUT) {
if (vp->inputs[src->Index] != -1)
return vp->inputs[src->Index];
for (i = 0; i < VERT_ATTRIB_MAX; i++)
if (vp->inputs[i] > max_reg)
max_reg = vp->inputs[i];
vp->inputs[src->Index] = max_reg + 1;
//vp_dump_inputs(vp, __FUNCTION__);
assert(vp->inputs[src->Index] != -1);
return vp->inputs[src->Index];
} else {
if (src->Index < 0) {
@@ -944,11 +931,17 @@ static GLuint *r300TranslateOpcodeXPD(struct r300_vertex_program *vp,
static void t_inputs_outputs(struct r300_vertex_program *vp)
{
int i;
int cur_reg = 0;
int cur_reg;
for (i = 0; i < VERT_ATTRIB_MAX; i++)
vp->inputs[i] = -1;
cur_reg = -1;
for (i = 0; i < VERT_ATTRIB_MAX; i++) {
if (vp->key.InputsRead & (1 << i))
vp->inputs[i] = ++cur_reg;
else
vp->inputs[i] = -1;
}
cur_reg = 0;
for (i = 0; i < VERT_RESULT_MAX; i++)
vp->outputs[i] = -1;