projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_6_branch'
[mesa.git]
/
src
/
gallium
/
drivers
/
nv40
/
nv40_state_stipple.c
diff --git
a/src/gallium/drivers/nv40/nv40_state_stipple.c
b/src/gallium/drivers/nv40/nv40_state_stipple.c
index bd163582a39acc17517ba0e24fa5024f524d918e..b51024ad9b20c293d365a64145177deaa95d6d86 100644
(file)
--- a/
src/gallium/drivers/nv40/nv40_state_stipple.c
+++ b/
src/gallium/drivers/nv40/nv40_state_stipple.c
@@
-3,8
+3,8
@@
static boolean
nv40_state_stipple_validate(struct nv40_context *nv40)
{
static boolean
nv40_state_stipple_validate(struct nv40_context *nv40)
{
- struct pipe_rasterizer_state *rast = &nv40->
pipe_state.
rasterizer->pipe;
- struct nouveau_grobj *curie = nv40->
hw
->curie;
+ struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
+ struct nouveau_grobj *curie = nv40->
screen
->curie;
struct nouveau_stateobj *so;
if (nv40->state.hw[NV40_STATE_STIPPLE] &&
struct nouveau_stateobj *so;
if (nv40->state.hw[NV40_STATE_STIPPLE] &&
@@
-19,7
+19,7
@@
nv40_state_stipple_validate(struct nv40_context *nv40)
so_data (so, 1);
so_method(so, curie, NV40TCL_POLYGON_STIPPLE_PATTERN(0), 32);
for (i = 0; i < 32; i++)
so_data (so, 1);
so_method(so, curie, NV40TCL_POLYGON_STIPPLE_PATTERN(0), 32);
for (i = 0; i < 32; i++)
- so_data(so, nv40->
pipe_state.
stipple[i]);
+ so_data(so, nv40->stipple[i]);
} else {
so = so_new(2, 0);
so_method(so, curie, NV40TCL_POLYGON_STIPPLE_ENABLE, 1);
} else {
so = so_new(2, 0);
so_method(so, curie, NV40TCL_POLYGON_STIPPLE_ENABLE, 1);
@@
-27,7
+27,6
@@
nv40_state_stipple_validate(struct nv40_context *nv40)
}
so_ref(so, &nv40->state.hw[NV40_STATE_STIPPLE]);
}
so_ref(so, &nv40->state.hw[NV40_STATE_STIPPLE]);
- so_ref(NULL, &so);
return TRUE;
}
return TRUE;
}