nv30: Emit scissor state using state objects

This commit is contained in:
Patrice Mandin 2008-07-03 22:18:38 +02:00
parent c66f376e27
commit f1d24c1d27
3 changed files with 4 additions and 3 deletions

View file

@ -211,6 +211,7 @@ extern boolean nv30_state_validate(struct nv30_context *nv30);
extern void nv30_emit_hw_state(struct nv30_context *nv30);
extern void nv30_state_tex_update(struct nv30_context *nv30);
extern struct nv30_state_entry nv30_state_rasterizer;
extern struct nv30_state_entry nv30_state_scissor;
extern struct nv30_state_entry nv30_state_blend;
extern struct nv30_state_entry nv30_state_blend_colour;
extern struct nv30_state_entry nv30_state_zsa;

View file

@ -607,9 +607,8 @@ nv30_set_scissor_state(struct pipe_context *pipe,
{
struct nv30_context *nv30 = nv30_context(pipe);
BEGIN_RING(rankine, NV34TCL_SCISSOR_HORIZ, 2);
OUT_RING (((s->maxx - s->minx) << 16) | s->minx);
OUT_RING (((s->maxy - s->miny) << 16) | s->miny);
nv30->scissor = *s;
nv30->dirty |= NV30_NEW_SCISSOR;
}
static void

View file

@ -4,6 +4,7 @@
static struct nv30_state_entry *render_states[] = {
&nv30_state_framebuffer,
&nv30_state_rasterizer,
&nv30_state_scissor,
&nv30_state_blend,
&nv30_state_blend_colour,
&nv30_state_zsa,