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

nvfx: so->RING_3D: stipple

Browse Source
This commit is contained in:
Luca Barbieri
2010-02-23 15:09:32 +01:00
parent 5c89cb0f6c
commit f8f29e6191
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nvfx/nvfx_context.c
+1
View File
@@ -85,5 +85,6 @@ nvfx_create(struct pipe_screen *pscreen, void *priv)
/* set these to that we init them on first validation */
nvfx->state.scissor_enabled = ~0;
nvfx->state.stipple_enabled = ~0;
return &nvfx->pipe;
}
src/gallium/drivers/nvfx/nvfx_state_stipple.c
+10 -15
View File
@@ -3,31 +3,27 @@
static boolean
nvfx_state_stipple_validate(struct nvfx_context *nvfx)
{
struct nouveau_channel *chan = nvfx->screen->base.channel;
struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
struct nouveau_grobj *eng3d = nvfx->screen->eng3d;
struct nouveau_stateobj *so;
if (nvfx->state.hw[NVFX_STATE_STIPPLE] &&
(rast->poly_stipple_enable == 0 && nvfx->state.stipple_enabled == 0))
if ((rast->poly_stipple_enable == 0 && nvfx->state.stipple_enabled == 0))
return FALSE;
if (rast->poly_stipple_enable) {
unsigned i;
so = so_new(2, 33, 0);
so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
so_data (so, 1);
so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
WAIT_RING(chan, 35);
OUT_RING(chan, RING_3D(NV34TCL_POLYGON_STIPPLE_ENABLE, 1));
OUT_RING(chan, 1);
OUT_RING(chan, RING_3D(NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32));
for (i = 0; i < 32; i++)
so_data(so, nvfx->stipple[i]);
OUT_RING(chan, nvfx->stipple[i]);
} else {
so = so_new(1, 1, 0);
so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
so_data (so, 0);
WAIT_RING(chan, 2);
OUT_RING(chan, RING_3D(NV34TCL_POLYGON_STIPPLE_ENABLE, 1));
OUT_RING(chan, 0);
}
so_ref(so, &nvfx->state.hw[NVFX_STATE_STIPPLE]);
so_ref(NULL, &so);
return TRUE;
}
@@ -35,6 +31,5 @@ struct nvfx_state_entry nvfx_state_stipple = {
.validate = nvfx_state_stipple_validate,
.dirty = {
.pipe = NVFX_NEW_STIPPLE | NVFX_NEW_RAST,
.hw = NVFX_STATE_STIPPLE,
}
};