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

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

Browse source
This commit is contained in:
Luca Barbieri 2010-02-20 20:37:17 +01:00 • committed by Younes Manton
parent 778c64da97
commit 0b55e1cd17
9 changed files with 13 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,6 @@ C_SOURCES = \
nv30_query.c \
nv30_screen.c \
nv30_state.c \
nv30_state_blend.c \
nv30_state_fb.c \
nv30_state_rasterizer.c \
nv30_state_scissor.c \

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

@ -29,8 +29,6 @@ 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;
extern struct nvfx_state_entry nv30_state_blend;
extern struct nvfx_state_entry nv30_state_blend_colour;
extern struct nvfx_state_entry nv30_state_zsa;
extern struct nvfx_state_entry nv30_state_viewport;
extern struct nvfx_state_entry nv30_state_framebuffer;

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

@ -12,7 +12,6 @@ C_SOURCES = \
nv40_query.c \
nv40_screen.c \
nv40_state.c \
nv40_state_blend.c \
nv40_state_fb.c \
nv40_state_rasterizer.c \
nv40_state_scissor.c \

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

@ -33,8 +33,6 @@ 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;
extern struct nvfx_state_entry nv40_state_blend;
extern struct nvfx_state_entry nv40_state_blend_colour;
extern struct nvfx_state_entry nv40_state_zsa;
extern struct nvfx_state_entry nv40_state_viewport;
extern struct nvfx_state_entry nv40_state_framebuffer;

41
src/gallium/drivers/nv40/nv40_state_blend.c
View file

@ -1,41 +0,0 @@
#include "nv40_context.h"
static boolean
nv40_state_blend_validate(struct nvfx_context *nvfx)
{
so_ref(nvfx->blend->so, &nvfx->state.hw[NVFX_STATE_BLEND]);
return TRUE;
}
struct nvfx_state_entry nv40_state_blend = {
.validate = nv40_state_blend_validate,
.dirty = {
.pipe = NVFX_NEW_BLEND,
.hw = NVFX_STATE_BLEND
}
};
static boolean
nv40_state_blend_colour_validate(struct nvfx_context *nvfx)
{
struct nouveau_stateobj *so = so_new(1, 1, 0);
struct pipe_blend_color *bcol = &nvfx->blend_colour;
so_method(so, nvfx->screen->eng3d, NV34TCL_BLEND_COLOR, 1);
so_data (so, ((float_to_ubyte(bcol->color[3]) << 24) |
(float_to_ubyte(bcol->color[0]) << 16) |
(float_to_ubyte(bcol->color[1]) << 8) |
(float_to_ubyte(bcol->color[2]) << 0)));
so_ref(so, &nvfx->state.hw[NVFX_STATE_BCOL]);
so_ref(NULL, &so);
return TRUE;
}
struct nvfx_state_entry nv40_state_blend_colour = {
.validate = nv40_state_blend_colour_validate,
.dirty = {
.pipe = NVFX_NEW_BCOL,
.hw = NVFX_STATE_BCOL
}
};

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

@ -6,6 +6,7 @@ LIBNAME = nvfx
C_SOURCES = \
nvfx_clear.c \
nvfx_state_emit.c \
nvfx_state_blend.c \
nvfx_transfer.c
include ../../Makefile.template

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

@ -181,6 +181,9 @@ struct nvfx_state_entry {
} dirty;
};
extern struct nvfx_state_entry nvfx_state_blend;
extern struct nvfx_state_entry nvfx_state_blend_colour;
/* nvfx_clear.c */
extern void nvfx_clear(struct pipe_context *pipe, unsigned buffers,
const float *rgba, double depth, unsigned stencil);

14
src/gallium/drivers/nv30/nv30_state_blend.c → src/gallium/drivers/nvfx/nvfx_state_blend.c
View file

@ -1,14 +1,14 @@
#include "nv30_context.h"
#include "nvfx_context.h"
static boolean
nv30_state_blend_validate(struct nvfx_context *nvfx)
nvfx_state_blend_validate(struct nvfx_context *nvfx)
{
so_ref(nvfx->blend->so, &nvfx->state.hw[NVFX_STATE_BLEND]);
return TRUE;
}
struct nvfx_state_entry nv30_state_blend = {
.validate = nv30_state_blend_validate,
struct nvfx_state_entry nvfx_state_blend = {
.validate = nvfx_state_blend_validate,
.dirty = {
.pipe = NVFX_NEW_BLEND,
.hw = NVFX_STATE_BLEND
@ -16,7 +16,7 @@ struct nvfx_state_entry nv30_state_blend = {
};
static boolean
nv30_state_blend_colour_validate(struct nvfx_context *nvfx)
nvfx_state_blend_colour_validate(struct nvfx_context *nvfx)
{
struct nouveau_stateobj *so = so_new(1, 1, 0);
struct pipe_blend_color *bcol = &nvfx->blend_colour;
@ -32,8 +32,8 @@ nv30_state_blend_colour_validate(struct nvfx_context *nvfx)
return TRUE;
}
struct nvfx_state_entry nv30_state_blend_colour = {
.validate = nv30_state_blend_colour_validate,
struct nvfx_state_entry nvfx_state_blend_colour = {
.validate = nvfx_state_blend_colour_validate,
.dirty = {
.pipe = NVFX_NEW_BCOL,
.hw = NVFX_STATE_BCOL

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

@ -12,8 +12,8 @@ static struct nvfx_state_entry *name##_render_states[] = { \
&nvxx##_state_fragprog, \
&nvxx##_state_fragtex, \
&nvxx##_state_vertprog, \
&nvxx##_state_blend, \
&nvxx##_state_blend_colour, \
&nvfx_state_blend, \
&nvfx_state_blend_colour, \
&nvxx##_state_zsa, \
&nvxx##_state_sr, \
&nvxx##_state_viewport, \