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

nv40: move some things around

This commit is contained in:
Ben Skeggs 2008-02-18 16:38:27 +11:00
parent 112ba3355a
commit 56045da083
6 changed files with 114 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/nv40/Makefile
View File

@ -13,6 +13,9 @@ DRIVER_SOURCES = \
nv40_query.c \
nv40_state.c \
nv40_state_emit.c \
nv40_state_clip.c \
nv40_state_scissor.c \
nv40_state_stipple.c \
nv40_surface.c \
nv40_vbo.c \
nv40_vertprog.c

3
src/gallium/drivers/nv40/nv40_context.h
View File

@ -174,6 +174,9 @@ extern void nv40_fragtex_bind(struct nv40_context *);
/* nv40_state.c and friends */
extern void nv40_emit_hw_state(struct nv40_context *nv40);
extern void nv40_state_tex_update(struct nv40_context *nv40);
extern struct nv40_state_entry nv40_state_clip;
extern struct nv40_state_entry nv40_state_scissor;
extern struct nv40_state_entry nv40_state_stipple;
/* nv40_vbo.c */
extern boolean nv40_draw_arrays(struct pipe_context *, unsigned mode,

18
src/gallium/drivers/nv40/nv40_state_clip.c Normal file
View File

@ -0,0 +1,18 @@
#include "nv40_context.h"
static boolean
nv40_state_clip_validate(struct nv40_context *nv40)
{
if (nv40->pipe_state.clip.nr)
nv40->fallback |= NV40_FALLBACK_TNL;
return FALSE;
}
struct nv40_state_entry nv40_state_clip = {
.validate = nv40_state_clip_validate,
.dirty = {
.pipe = NV40_NEW_UCP,
.hw = 0
}
};

99
src/gallium/drivers/nv40/nv40_state_emit.c
View File

@ -22,63 +22,6 @@ nv40_state_emit_dummy_relocs(struct nv40_context *nv40)
so_emit_reloc_markers(nv40->nvws, nv40->fragprog.active->so);
}
static boolean
nv40_state_scissor_validate(struct nv40_context *nv40)
{
struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
struct pipe_scissor_state *s = &nv40->pipe_state.scissor;
struct nouveau_stateobj *so;
if (nv40->state.scissor.so &&
(rast->scissor == 0 && nv40->state.scissor.enabled == 0))
return FALSE;
so = so_new(3, 0);
so_method(so, nv40->hw->curie, NV40TCL_SCISSOR_HORIZ, 2);
if (rast->scissor) {
so_data (so, ((s->maxx - s->minx) << 16) | s->minx);
so_data (so, ((s->maxy - s->miny) << 16) | s->miny);
} else {
so_data (so, 4096 << 16);
so_data (so, 4096 << 16);
}
so_ref(so, &nv40->state.scissor.so);
so_ref(NULL, &so);
return TRUE;
}
static boolean
nv40_state_stipple_validate(struct nv40_context *nv40)
{
struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
struct nouveau_grobj *curie = nv40->hw->curie;
struct nouveau_stateobj *so;
if (nv40->state.stipple.so && (rast->poly_stipple_enable == 0 &&
nv40->state.stipple.enabled == 0))
return FALSE;
if (rast->poly_stipple_enable) {
unsigned i;
so = so_new(35, 0);
so_method(so, curie, NV40TCL_POLYGON_STIPPLE_ENABLE, 1);
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]);
} else {
so = so_new(2, 0);
so_method(so, curie, NV40TCL_POLYGON_STIPPLE_ENABLE, 1);
so_data (so, 0);
}
so_ref(so, &nv40->state.stipple.so);
so_ref(NULL, &so);
return TRUE;
}
static boolean
nv40_state_clip_validate(struct nv40_context *nv40)
{
@ -87,43 +30,31 @@ nv40_state_clip_validate(struct nv40_context *nv40)
return FALSE;
}
static struct nv40_state_entry states[] = {
{
.validate = nv40_state_scissor_validate,
.dirty = {
.pipe = NV40_NEW_SCISSOR | NV40_NEW_RAST,
.hw = NV40_NEW_SCISSOR,
}
},
{
.validate = nv40_state_stipple_validate,
.dirty = {
.pipe = NV40_NEW_STIPPLE | NV40_NEW_RAST,
.hw = NV40_NEW_STIPPLE,
}
},
{
.validate = nv40_state_clip_validate,
.dirty = {
.pipe = NV40_NEW_UCP,
.hw = 0,
}
}
static struct nv40_state_entry *render_states[] = {
&nv40_state_clip,
&nv40_state_scissor,
&nv40_state_stipple,
NULL
};
static void
nv40_state_validate(struct nv40_context *nv40)
{
unsigned i, last_fallback;
struct nv40_state_entry **states = render_states;
unsigned last_fallback;
last_fallback = nv40->fallback;
nv40->fallback = 0;
for (i = 0; i < sizeof(states) / sizeof(states[0]); i++) {
if (nv40->dirty & states[i].dirty.pipe) {
if (states[i].validate(nv40))
nv40->hw_dirty |= states[i].dirty.hw;
while (*states) {
struct nv40_state_entry *e = *states;
if (nv40->dirty & e->dirty.pipe) {
if (e->validate(nv40))
nv40->hw_dirty |= e->dirty.hw;
}
states++;
}
if (nv40->fallback & NV40_FALLBACK_TNL &&

35
src/gallium/drivers/nv40/nv40_state_scissor.c Normal file
View File

@ -0,0 +1,35 @@
#include "nv40_context.h"
static boolean
nv40_state_scissor_validate(struct nv40_context *nv40)
{
struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
struct pipe_scissor_state *s = &nv40->pipe_state.scissor;
struct nouveau_stateobj *so;
if (nv40->state.scissor.so &&
(rast->scissor == 0 && nv40->state.scissor.enabled == 0))
return FALSE;
so = so_new(3, 0);
so_method(so, nv40->hw->curie, NV40TCL_SCISSOR_HORIZ, 2);
if (rast->scissor) {
so_data (so, ((s->maxx - s->minx) << 16) | s->minx);
so_data (so, ((s->maxy - s->miny) << 16) | s->miny);
} else {
so_data (so, 4096 << 16);
so_data (so, 4096 << 16);
}
so_ref(so, &nv40->state.scissor.so);
so_ref(NULL, &so);
return TRUE;
}
struct nv40_state_entry nv40_state_scissor = {
.validate = nv40_state_scissor_validate,
.dirty = {
.pipe = NV40_NEW_SCISSOR | NV40_NEW_RAST,
.hw = NV40_NEW_SCISSOR
}
};

40
src/gallium/drivers/nv40/nv40_state_stipple.c Normal file
View File

@ -0,0 +1,40 @@
#include "nv40_context.h"
static boolean
nv40_state_stipple_validate(struct nv40_context *nv40)
{
struct pipe_rasterizer_state *rast = &nv40->rasterizer->pipe;
struct nouveau_grobj *curie = nv40->hw->curie;
struct nouveau_stateobj *so;
if (nv40->state.stipple.so && (rast->poly_stipple_enable == 0 &&
nv40->state.stipple.enabled == 0))
return FALSE;
if (rast->poly_stipple_enable) {
unsigned i;
so = so_new(35, 0);
so_method(so, curie, NV40TCL_POLYGON_STIPPLE_ENABLE, 1);
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]);
} else {
so = so_new(2, 0);
so_method(so, curie, NV40TCL_POLYGON_STIPPLE_ENABLE, 1);
so_data (so, 0);
}
so_ref(so, &nv40->state.stipple.so);
so_ref(NULL, &so);
return TRUE;
}
struct nv40_state_entry nv40_state_stipple = {
.validate = nv40_state_stipple_validate,
.dirty = {
.pipe = NV40_NEW_STIPPLE | NV40_NEW_RAST,
.hw = NV40_NEW_STIPPLE
}
};