projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nv30, nv40: unify all structures and headers, except shaders
[mesa.git]
/
src
/
gallium
/
drivers
/
nv30
/
nv30_state_stipple.c
diff --git
a/src/gallium/drivers/nv30/nv30_state_stipple.c
b/src/gallium/drivers/nv30/nv30_state_stipple.c
index 41b42813b496c505aafb1a1271976f3c6c68bbea..eceb0c57f97f888d5829f2ddeb8798752eef9915 100644
(file)
--- a/
src/gallium/drivers/nv30/nv30_state_stipple.c
+++ b/
src/gallium/drivers/nv30/nv30_state_stipple.c
@@
-1,39
+1,40
@@
#include "nv30_context.h"
static boolean
#include "nv30_context.h"
static boolean
-nv30_state_stipple_validate(struct nv
30_context *nv30
)
+nv30_state_stipple_validate(struct nv
fx_context *nvfx
)
{
{
- struct pipe_rasterizer_state *rast = &nv
30
->rasterizer->pipe;
- struct nouveau_grobj *
rankine = nv30->screen->rankine
;
+ struct pipe_rasterizer_state *rast = &nv
fx
->rasterizer->pipe;
+ struct nouveau_grobj *
eng3d = nvfx->screen->eng3d
;
struct nouveau_stateobj *so;
struct nouveau_stateobj *so;
- if (nv
30->state.hw[NV30
_STATE_STIPPLE] &&
- (rast->poly_stipple_enable == 0 && nv
30
->state.stipple_enabled == 0))
+ if (nv
fx->state.hw[NVFX
_STATE_STIPPLE] &&
+ (rast->poly_stipple_enable == 0 && nv
fx
->state.stipple_enabled == 0))
return FALSE;
if (rast->poly_stipple_enable) {
unsigned i;
return FALSE;
if (rast->poly_stipple_enable) {
unsigned i;
- so = so_new(
35
, 0);
- so_method(so,
rankine
, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
+ so = so_new(
2, 33
, 0);
+ so_method(so,
eng3d
, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
so_data (so, 1);
so_data (so, 1);
- so_method(so,
rankine
, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
+ so_method(so,
eng3d
, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
for (i = 0; i < 32; i++)
for (i = 0; i < 32; i++)
- so_data(so, nv
30
->stipple[i]);
+ so_data(so, nv
fx
->stipple[i]);
} else {
} else {
- so = so_new(
2
, 0);
- so_method(so,
rankine
, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
+ so = so_new(
1, 1
, 0);
+ so_method(so,
eng3d
, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
so_data (so, 0);
}
so_data (so, 0);
}
- so_ref(so, &nv30->state.hw[NV30_STATE_STIPPLE]);
+ so_ref(so, &nvfx->state.hw[NVFX_STATE_STIPPLE]);
+ so_ref(NULL, &so);
return TRUE;
}
return TRUE;
}
-struct nv
30
_state_entry nv30_state_stipple = {
+struct nv
fx
_state_entry nv30_state_stipple = {
.validate = nv30_state_stipple_validate,
.dirty = {
.validate = nv30_state_stipple_validate,
.dirty = {
- .pipe = NV
30_NEW_STIPPLE | NV30
_NEW_RAST,
- .hw = NV
30
_STATE_STIPPLE,
+ .pipe = NV
FX_NEW_STIPPLE | NVFX
_NEW_RAST,
+ .hw = NV
FX
_STATE_STIPPLE,
}
};
}
};