fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 20:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
The files are identical, except for the fact that the nv40 version
forgets to unreference the stateobj.

Unified to the correct nv30 version.
This commit is contained in:
Luca Barbieri 2010-02-20 19:22:57 +01:00 • committed by Younes Manton
parent 64d882637d
commit e392e0b148
9 changed files with 7 additions and 48 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_stipple.c \
nv30_state_viewport.c \
nv30_surface.c \
nv30_vbo.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_stipple;
extern struct nvfx_state_entry nv30_state_fragprog;
extern struct nvfx_state_entry nv30_state_vertprog;
extern struct nvfx_state_entry nv30_state_viewport;

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_stipple.c \
nv40_state_viewport.c \
nv40_surface.c \
nv40_vbo.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_stipple;
extern struct nvfx_state_entry nv40_state_fragprog;
extern struct nvfx_state_entry nv40_state_vertprog;
extern struct nvfx_state_entry nv40_state_viewport;

39
src/gallium/drivers/nv40/nv40_state_stipple.c
View file

@ -1,39 +0,0 @@
#include "nv40_context.h"
static boolean
nv40_state_stipple_validate(struct nvfx_context *nvfx)
{
struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
struct nouveau_grobj *eng3d = nvfx->screen->eng3d;
struct nouveau_stateobj *so;
if (nvfx->state.hw[NVFX_STATE_STIPPLE] &&
(rast->poly_stipple_enable == 0 && nvfx->state.stipple_enabled == 0))
return FALSE;
if (rast->poly_stipple_enable) {
unsigned i;
so = so_new(2, 33, 0);
so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
so_data (so, 1);
so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_PATTERN(0), 32);
for (i = 0; i < 32; i++)
so_data(so, nvfx->stipple[i]);
} else {
so = so_new(1, 1, 0);
so_method(so, eng3d, NV34TCL_POLYGON_STIPPLE_ENABLE, 1);
so_data (so, 0);
}
so_ref(so, &nvfx->state.hw[NVFX_STATE_STIPPLE]);
return TRUE;
}
struct nvfx_state_entry nv40_state_stipple = {
.validate = nv40_state_stipple_validate,
.dirty = {
.pipe = NVFX_NEW_STIPPLE | NVFX_NEW_RAST,
.hw = NVFX_STATE_STIPPLE,
}
};

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

@ -9,6 +9,7 @@ C_SOURCES = \
nvfx_state_blend.c \
nvfx_state_rasterizer.c \
nvfx_state_scissor.c \
nvfx_state_stipple.c \
nvfx_state_zsa.c \
nvfx_transfer.c

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

@ -186,6 +186,7 @@ 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;
extern struct nvfx_state_entry nvfx_state_sr;
extern struct nvfx_state_entry nvfx_state_stipple;
extern struct nvfx_state_entry nvfx_state_zsa;
/* nvfx_clear.c */

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

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

8
src/gallium/drivers/nv30/nv30_state_stipple.c → src/gallium/drivers/nvfx/nvfx_state_stipple.c
View file

@ -1,7 +1,7 @@
#include "nv30_context.h"
#include "nvfx_context.h"
static boolean
nv30_state_stipple_validate(struct nvfx_context *nvfx)
nvfx_state_stipple_validate(struct nvfx_context *nvfx)
{
struct pipe_rasterizer_state *rast = &nvfx->rasterizer->pipe;
struct nouveau_grobj *eng3d = nvfx->screen->eng3d;
@ -31,8 +31,8 @@ nv30_state_stipple_validate(struct nvfx_context *nvfx)
return TRUE;
}
struct nvfx_state_entry nv30_state_stipple = {
.validate = nv30_state_stipple_validate,
struct nvfx_state_entry nvfx_state_stipple = {
.validate = nvfx_state_stipple_validate,
.dirty = {
.pipe = NVFX_NEW_STIPPLE | NVFX_NEW_RAST,
.hw = NVFX_STATE_STIPPLE,