fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 21:30:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

nv30, nv40: unify identical nv[34]0_state_scissor.c

Browse source
This commit is contained in:
Luca Barbieri 2010-02-20 23:17:41 +01:00 • committed by Younes Manton
parent ada801222b
commit 938c6905cf
9 changed files with 7 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/nv30/Makefile
View file

@ -13,7 +13,6 @@ C_SOURCES = \
nv30_screen.c \
nv30_state.c \
nv30_state_fb.c \
nv30_state_scissor.c \
nv30_state_stipple.c \
nv30_state_viewport.c \
nv30_state_zsa.c \

1
src/gallium/drivers/nv30/nv30_context.h
View file

@ -24,7 +24,6 @@ extern void nv30_fragprog_destroy(struct nvfx_context *,
extern void nv30_fragtex_bind(struct nvfx_context *);
/* nv30_state.c and friends */
extern struct nvfx_state_entry nv30_state_scissor;
extern struct nvfx_state_entry nv30_state_stipple;
extern struct nvfx_state_entry nv30_state_fragprog;
extern struct nvfx_state_entry nv30_state_vertprog;

1
src/gallium/drivers/nv40/Makefile
View file

@ -13,7 +13,6 @@ C_SOURCES = \
nv40_screen.c \
nv40_state.c \
nv40_state_fb.c \
nv40_state_scissor.c \
nv40_state_stipple.c \
nv40_state_viewport.c \
nv40_state_zsa.c \

1
src/gallium/drivers/nv40/nv40_context.h
View file

@ -28,7 +28,6 @@ extern void nv40_fragprog_destroy(struct nvfx_context *,
extern void nv40_fragtex_bind(struct nvfx_context *);
/* nv40_state.c and friends */
extern struct nvfx_state_entry nv40_state_scissor;
extern struct nvfx_state_entry nv40_state_stipple;
extern struct nvfx_state_entry nv40_state_fragprog;
extern struct nvfx_state_entry nv40_state_vertprog;

36
src/gallium/drivers/nv40/nv40_state_scissor.c
View file

@ -1,36 +0,0 @@
#include "nv40_context.h"
static boolean
nv40_state_scissor_validate(struct nvfx_context *nvfx)
{
struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
struct pipe_scissor_state *s = &nvfx->scissor;
struct nouveau_stateobj *so;
if (nvfx->state.hw[NVFX_STATE_SCISSOR] &&
(rast->scissor == 0 && nvfx->state.scissor_enabled == 0))
return FALSE;
nvfx->state.scissor_enabled = rast->scissor;
so = so_new(1, 2, 0);
so_method(so, nvfx->screen->eng3d, NV34TCL_SCISSOR_HORIZ, 2);
if (nvfx->state.scissor_enabled) {
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, &nvfx->state.hw[NVFX_STATE_SCISSOR]);
so_ref(NULL, &so);
return TRUE;
}
struct nvfx_state_entry nv40_state_scissor = {
.validate = nv40_state_scissor_validate,
.dirty = {
.pipe = NVFX_NEW_SCISSOR | NVFX_NEW_RAST,
.hw = NVFX_STATE_SCISSOR
}
};

1
src/gallium/drivers/nvfx/Makefile
View file

@ -8,6 +8,7 @@ C_SOURCES = \
nvfx_state_emit.c \
nvfx_state_blend.c \
nvfx_state_rasterizer.c \
nvfx_state_scissor.c \
nvfx_transfer.c
include ../../Makefile.template

1
src/gallium/drivers/nvfx/nvfx_context.h
View file

@ -184,6 +184,7 @@ struct nvfx_state_entry {
extern struct nvfx_state_entry nvfx_state_blend;
extern struct nvfx_state_entry nvfx_state_blend_colour;
extern struct nvfx_state_entry nvfx_state_rasterizer;
extern struct nvfx_state_entry nvfx_state_scissor;
/* nvfx_clear.c */
extern void nvfx_clear(struct pipe_context *pipe, unsigned buffers,

2
src/gallium/drivers/nvfx/nvfx_state_emit.c
View file

@ -7,7 +7,7 @@
static struct nvfx_state_entry *name##_render_states[] = { \
&nvxx##_state_framebuffer, \
&nvfx_state_rasterizer, \
&nvxx##_state_scissor, \
&nvfx_state_scissor, \
&nvxx##_state_stipple, \
&nvxx##_state_fragprog, \
&nvxx##_state_fragtex, \

8
src/gallium/drivers/nv30/nv30_state_scissor.c → src/gallium/drivers/nvfx/nvfx_state_scissor.c
View file

@ -1,7 +1,7 @@
#include "nv30_context.h"
#include "nvfx_context.h"
static boolean
nv30_state_scissor_validate(struct nvfx_context *nvfx)
nvfx_state_scissor_validate(struct nvfx_context *nvfx)
{
struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
struct pipe_scissor_state *s = &nvfx->scissor;
@ -27,8 +27,8 @@ nv30_state_scissor_validate(struct nvfx_context *nvfx)
return TRUE;
}
struct nvfx_state_entry nv30_state_scissor = {
.validate = nv30_state_scissor_validate,
struct nvfx_state_entry nvfx_state_scissor = {
.validate = nvfx_state_scissor_validate,
.dirty = {
.pipe = NVFX_NEW_SCISSOR | NVFX_NEW_RAST,
.hw = NVFX_STATE_SCISSOR