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

nv30: a couple of vtxprog fixes

Browse Source
This commit is contained in:
Ben Skeggs
2008-03-06 11:52:25 +11:00
parent 1de15ad83e
commit 82f22d9e14
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nv30/nv30_context.c
+1 -1
View File
@@ -319,7 +319,7 @@ nv30_create(struct pipe_screen *screen, unsigned pctx_id)
}
/* Vtxprog resources */
if (nvws->res_init(&nv30->vertprog.exec_heap, 0, 512) ||
if (nvws->res_init(&nv30->vertprog.exec_heap, 0, 256) ||
nvws->res_init(&nv30->vertprog.data_heap, 0, 256)) {
nv30_destroy(&nv30->pipe);
return NULL;
src/gallium/drivers/nv30/nv30_vertprog.c
+14 -3
View File
@@ -225,6 +225,18 @@ nv30_vp_arith(struct nv30_vpc *vpc, int slot, int op,
// hw[3] |= NV30_VP_INST_SCA_DEST_TEMP_MASK;
// hw[3] |= (mask << NV30_VP_INST_VEC_WRITEMASK_SHIFT);
if (dst.type == NV30SR_OUTPUT) {
if (slot)
hw[3] |= (mask << NV30_VP_INST_SDEST_WRITEMASK_SHIFT);
else
hw[3] |= (mask << NV30_VP_INST_VDEST_WRITEMASK_SHIFT);
} else {
if (slot)
hw[3] |= (mask << NV30_VP_INST_STEMP_WRITEMASK_SHIFT);
else
hw[3] |= (mask << NV30_VP_INST_VTEMP_WRITEMASK_SHIFT);
}
emit_dst(vpc, hw, slot, dst);
emit_src(vpc, hw, 0, s0);
emit_src(vpc, hw, 1, s1);
@@ -752,7 +764,7 @@ nv30_vertprog_bind(struct nv30_context *nv30, struct nv30_vertex_program *vp)
}
#endif
BEGIN_RING(rankine, NV34TCL_VP_UPLOAD_FROM_ID, 1);
OUT_RING (/*vp->exec->start*/0);
OUT_RING (vp->exec->start);
for (i = 0; i < vp->nr_insns; i++) {
BEGIN_RING(rankine, NV34TCL_VP_UPLOAD_INST(0), 4);
OUT_RINGp (vp->insns[i].data, 4);
@@ -760,8 +772,7 @@ nv30_vertprog_bind(struct nv30_context *nv30, struct nv30_vertex_program *vp)
}
BEGIN_RING(rankine, NV34TCL_VP_START_FROM_ID, 1);
// OUT_RING (vp->exec->start);
OUT_RING (0);
OUT_RING (vp->exec->start);
nv30->vertprog.active = vp;
}