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

nv30, nv40: non-trivially unify nv[34]0_state_emit.c

Browse source 
The files are the same except for swtnl support on nv40 and for
texture cache flushing on nv40.

Unify them, and use a macro to define 4 versions of render_states,
for all combinations of nvfx and hwtnl/swtnl.
This commit is contained in:
Luca Barbieri 2010-02-21 11:33:15 +01:00 • committed by Younes Manton
parent d084d189d0
commit 778c64da97
13 changed files with 74 additions and 198 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_blend.c \
nv30_state_emit.c \
nv30_state_fb.c \
nv30_state_rasterizer.c \
nv30_state_scissor.c \

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

@ -69,7 +69,7 @@ nv30_create(struct pipe_screen *pscreen, void *priv)
nvfx->pipe.is_buffer_referenced = nouveau_is_buffer_referenced;
screen->base.channel->user_private = nvfx;
screen->base.channel->flush_notify = nv30_state_flush_notify;
screen->base.channel->flush_notify = nvfx_state_flush_notify;
nvfx->is_nv4x = screen->is_nv4x;

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

@ -24,9 +24,6 @@ extern void nv30_fragprog_destroy(struct nvfx_context *,
extern void nv30_fragtex_bind(struct nvfx_context *);
/* nv30_state.c and friends */
extern boolean nv30_state_validate(struct nvfx_context *nvfx);
extern void nv30_state_emit(struct nvfx_context *nvfx);
extern void nv30_state_flush_notify(struct nouveau_channel *chan);
extern struct nvfx_state_entry nv30_state_rasterizer;
extern struct nvfx_state_entry nv30_state_scissor;
extern struct nvfx_state_entry nv30_state_stipple;

121
src/gallium/drivers/nv30/nv30_state_emit.c
View file

@ -1,121 +0,0 @@
#include "nv30_context.h"
#include "nvfx_state.h"
static struct nvfx_state_entry *render_states[] = {
&nv30_state_framebuffer,
&nv30_state_rasterizer,
&nv30_state_scissor,
&nv30_state_stipple,
&nv30_state_fragprog,
&nv30_state_fragtex,
&nv30_state_vertprog,
&nv30_state_blend,
&nv30_state_blend_colour,
&nv30_state_zsa,
&nv30_state_sr,
&nv30_state_viewport,
&nv30_state_vbo,
NULL
};
static void
nv30_state_do_validate(struct nvfx_context *nvfx,
struct nvfx_state_entry **states)
{
while (*states) {
struct nvfx_state_entry *e = *states;
if (nvfx->dirty & e->dirty.pipe) {
if (e->validate(nvfx))
nvfx->state.dirty |= (1ULL << e->dirty.hw);
}
states++;
}
nvfx->dirty = 0;
}
void
nv30_state_emit(struct nvfx_context *nvfx)
{
struct nouveau_channel *chan = nvfx->screen->base.channel;
struct nvfx_state *state = &nvfx->state;
struct nvfx_screen *screen = nvfx->screen;
unsigned i;
uint64_t states;
/* XXX: racy!
*/
if (nvfx != screen->cur_ctx) {
for (i = 0; i < NVFX_STATE_MAX; i++) {
if (state->hw[i] && screen->state[i] != state->hw[i])
state->dirty |= (1ULL << i);
}
screen->cur_ctx = nvfx;
}
for (i = 0, states = state->dirty; states; i++) {
if (!(states & (1ULL << i)))
continue;
so_ref (state->hw[i], &nvfx->screen->state[i]);
if (state->hw[i])
so_emit(chan, nvfx->screen->state[i]);
states &= ~(1ULL << i);
}
state->dirty = 0;
}
void
nv30_state_flush_notify(struct nouveau_channel *chan)
{
struct nvfx_context *nvfx = chan->user_private;
struct nvfx_state *state = &nvfx->state;
unsigned i, samplers;
so_emit_reloc_markers(chan, state->hw[NVFX_STATE_FB]);
for (i = 0, samplers = state->fp_samplers; i < 16 && samplers; i++) {
if (!(samplers & (1 << i)))
continue;
so_emit_reloc_markers(chan,
state->hw[NVFX_STATE_FRAGTEX0+i]);
samplers &= ~(1ULL << i);
}
so_emit_reloc_markers(chan, state->hw[NVFX_STATE_FRAGPROG]);
if (state->hw[NVFX_STATE_VTXBUF] /*&& nvfx->render_mode == HW*/)
so_emit_reloc_markers(chan, state->hw[NVFX_STATE_VTXBUF]);
}
boolean
nv30_state_validate(struct nvfx_context *nvfx)
{
#if 0
boolean was_sw = nvfx->fallback_swtnl ? TRUE : FALSE;
if (nvfx->render_mode != HW) {
/* Don't even bother trying to go back to hw if none
* of the states that caused swtnl previously have changed.
*/
if ((nvfx->fallback_swtnl & nvfx->dirty)
!= nvfx->fallback_swtnl)
return FALSE;
/* Attempt to go to hwtnl again */
nvfx->pipe.flush(&nvfx->pipe, 0, NULL);
nvfx->dirty |= (NVFX_NEW_VIEWPORT |
NVFX_NEW_VERTPROG |
NVFX_NEW_ARRAYS);
nvfx->render_mode = HW;
}
#endif
nv30_state_do_validate(nvfx, render_states);
#if 0
if (nvfx->fallback_swtnl || nvfx->fallback_swrast)
return FALSE;
if (was_sw)
NOUVEAU_ERR("swtnl->hw\n");
#endif
return TRUE;
}

14
src/gallium/drivers/nv30/nv30_vbo.c
View file

@ -175,7 +175,7 @@ nv30_draw_arrays(struct pipe_context *pipe,
unsigned restart = 0;
nv30_vbo_set_idxbuf(nvfx, NULL, 0);
if (FORCE_SWTNL || !nv30_state_validate(nvfx)) {
if (FORCE_SWTNL || !nvfx_state_validate(nvfx)) {
/*return nv30_draw_elements_swtnl(pipe, NULL, 0,
mode, start, count);*/
return;
@ -184,7 +184,7 @@ nv30_draw_arrays(struct pipe_context *pipe,
while (count) {
unsigned vc, nr;
nv30_state_emit(nvfx);
nvfx_state_emit(nvfx);
vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 256,
mode, start, count, &restart);
@ -238,7 +238,7 @@ nv30_draw_elements_u08(struct nvfx_context *nvfx, void *ib,
uint8_t *elts = (uint8_t *)ib + start;
unsigned vc, push, restart = 0;
nv30_state_emit(nvfx);
nvfx_state_emit(nvfx);
vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 2,
mode, start, count, &restart);
@ -289,7 +289,7 @@ nv30_draw_elements_u16(struct nvfx_context *nvfx, void *ib,
uint16_t *elts = (uint16_t *)ib + start;
unsigned vc, push, restart = 0;
nv30_state_emit(nvfx);
nvfx_state_emit(nvfx);
vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 2,
mode, start, count, &restart);
@ -340,7 +340,7 @@ nv30_draw_elements_u32(struct nvfx_context *nvfx, void *ib,
uint32_t *elts = (uint32_t *)ib + start;
unsigned vc, push, restart = 0;
nv30_state_emit(nvfx);
nvfx_state_emit(nvfx);
vc = nouveau_vbuf_split(AVAIL_RING(chan), 5, 1,
mode, start, count, &restart);
@ -416,7 +416,7 @@ nv30_draw_elements_vbo(struct pipe_context *pipe,
while (count) {
unsigned nr, vc;
nv30_state_emit(nvfx);
nvfx_state_emit(nvfx);
vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 256,
mode, start, count, &restart);
@ -465,7 +465,7 @@ nv30_draw_elements(struct pipe_context *pipe,
boolean idxbuf;
idxbuf = nv30_vbo_set_idxbuf(nvfx, indexBuffer, indexSize);
if (FORCE_SWTNL || !nv30_state_validate(nvfx)) {
if (FORCE_SWTNL || !nvfx_state_validate(nvfx)) {
/*return nv30_draw_elements_swtnl(pipe, NULL, 0,
mode, start, count);*/
return;

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

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

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

@ -69,7 +69,7 @@ nv40_create(struct pipe_screen *pscreen, void *priv)
nvfx->pipe.is_buffer_referenced = nouveau_is_buffer_referenced;
screen->base.channel->user_private = nvfx;
screen->base.channel->flush_notify = nv40_state_flush_notify;
screen->base.channel->flush_notify = nvfx_state_flush_notify;
nvfx->is_nv4x = screen->is_nv4x;

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

@ -28,10 +28,6 @@ extern void nv40_fragprog_destroy(struct nvfx_context *,
extern void nv40_fragtex_bind(struct nvfx_context *);
/* nv40_state.c and friends */
extern boolean nv40_state_validate(struct nvfx_context *nvfx);
extern boolean nv40_state_validate_swtnl(struct nvfx_context *nvfx);
extern void nv40_state_emit(struct nvfx_context *nvfx);
extern void nv40_state_flush_notify(struct nouveau_channel *chan);
extern struct nvfx_state_entry nv40_state_rasterizer;
extern struct nvfx_state_entry nv40_state_scissor;
extern struct nvfx_state_entry nv40_state_stipple;

6
src/gallium/drivers/nv40/nv40_draw.c
View file

@ -98,7 +98,7 @@ nv40_render_prim(struct draw_stage *stage, struct prim_header *prim,
assert(0);
}
FIRE_RING(chan);
nv40_state_emit(nvfx);
nvfx_state_emit(nvfx);
}
/* Switch primitive modes if necessary */
@ -245,10 +245,10 @@ nv40_draw_elements_swtnl(struct pipe_context *pipe,
unsigned i;
void *map;
if (!nv40_state_validate_swtnl(nvfx))
if (!nvfx_state_validate_swtnl(nvfx))
return;
nvfx->state.dirty &= ~(1ULL << NVFX_STATE_VTXBUF);
nv40_state_emit(nvfx);
nvfx_state_emit(nvfx);
for (i = 0; i < nvfx->vtxbuf_nr; i++) {
map = pipe_buffer_map(pscreen, nvfx->vtxbuf[i].buffer,

14
src/gallium/drivers/nv40/nv40_vbo.c
View file

@ -176,7 +176,7 @@ nv40_draw_arrays(struct pipe_context *pipe,
unsigned restart;
nv40_vbo_set_idxbuf(nvfx, NULL, 0);
if (FORCE_SWTNL || !nv40_state_validate(nvfx)) {
if (FORCE_SWTNL || !nvfx_state_validate(nvfx)) {
nv40_draw_elements_swtnl(pipe, NULL, 0,
mode, start, count);
return;
@ -185,7 +185,7 @@ nv40_draw_arrays(struct pipe_context *pipe,
while (count) {
unsigned vc, nr;
nv40_state_emit(nvfx);
nvfx_state_emit(nvfx);
vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 256,
mode, start, count, &restart);
@ -239,7 +239,7 @@ nv40_draw_elements_u08(struct nvfx_context *nvfx, void *ib,
uint8_t *elts = (uint8_t *)ib + start;
unsigned vc, push, restart;
nv40_state_emit(nvfx);
nvfx_state_emit(nvfx);
vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 2,
mode, start, count, &restart);
@ -290,7 +290,7 @@ nv40_draw_elements_u16(struct nvfx_context *nvfx, void *ib,
uint16_t *elts = (uint16_t *)ib + start;
unsigned vc, push, restart;
nv40_state_emit(nvfx);
nvfx_state_emit(nvfx);
vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 2,
mode, start, count, &restart);
@ -341,7 +341,7 @@ nv40_draw_elements_u32(struct nvfx_context *nvfx, void *ib,
uint32_t *elts = (uint32_t *)ib + start;
unsigned vc, push, restart;
nv40_state_emit(nvfx);
nvfx_state_emit(nvfx);
vc = nouveau_vbuf_split(AVAIL_RING(chan), 5, 1,
mode, start, count, &restart);
@ -417,7 +417,7 @@ nv40_draw_elements_vbo(struct pipe_context *pipe,
while (count) {
unsigned nr, vc;
nv40_state_emit(nvfx);
nvfx_state_emit(nvfx);
vc = nouveau_vbuf_split(AVAIL_RING(chan), 6, 256,
mode, start, count, &restart);
@ -466,7 +466,7 @@ nv40_draw_elements(struct pipe_context *pipe,
boolean idxbuf;
idxbuf = nv40_vbo_set_idxbuf(nvfx, indexBuffer, indexSize);
if (FORCE_SWTNL || !nv40_state_validate(nvfx)) {
if (FORCE_SWTNL || !nvfx_state_validate(nvfx)) {
nv40_draw_elements_swtnl(pipe, NULL, 0,
mode, start, count);
return;

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

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

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

@ -185,6 +185,12 @@ struct nvfx_state_entry {
extern void nvfx_clear(struct pipe_context *pipe, unsigned buffers,
const float *rgba, double depth, unsigned stencil);
/* nvfx_state_emit.c */
extern void nvfx_state_flush_notify(struct nouveau_channel *chan);
extern boolean nvfx_state_validate(struct nvfx_context *nvfx);
extern boolean nvfx_state_validate_swtnl(struct nvfx_context *nvfx);
extern void nvfx_state_emit(struct nvfx_context *nvfx);
/* nvfx_transfer.c */
extern void nvfx_init_transfer_functions(struct nvfx_context *nvfx);

97
src/gallium/drivers/nv40/nv40_state_emit.c → src/gallium/drivers/nvfx/nvfx_state_emit.c
View file

@ -1,43 +1,33 @@
#include "nv40_context.h"
#include "nv30/nv30_context.h"
#include "nv40/nv40_context.h"
#include "nvfx_state.h"
#include "draw/draw_context.h"
static struct nvfx_state_entry *render_states[] = {
&nv40_state_framebuffer,
&nv40_state_rasterizer,
&nv40_state_scissor,
&nv40_state_stipple,
&nv40_state_fragprog,
&nv40_state_fragtex,
&nv40_state_vertprog,
&nv40_state_blend,
&nv40_state_blend_colour,
&nv40_state_zsa,
&nv40_state_sr,
&nv40_state_viewport,
&nv40_state_vbo,
NULL
};
#define RENDER_STATES(name, nvxx, vbo) \
static struct nvfx_state_entry *name##_render_states[] = { \
&nvxx##_state_framebuffer, \
&nvxx##_state_rasterizer, \
&nvxx##_state_scissor, \
&nvxx##_state_stipple, \
&nvxx##_state_fragprog, \
&nvxx##_state_fragtex, \
&nvxx##_state_vertprog, \
&nvxx##_state_blend, \
&nvxx##_state_blend_colour, \
&nvxx##_state_zsa, \
&nvxx##_state_sr, \
&nvxx##_state_viewport, \
&nvxx##_state_##vbo, \
NULL \
}
static struct nvfx_state_entry *swtnl_states[] = {
&nv40_state_framebuffer,
&nv40_state_rasterizer,
&nv40_state_scissor,
&nv40_state_stipple,
&nv40_state_fragprog,
&nv40_state_fragtex,
&nv40_state_vertprog,
&nv40_state_blend,
&nv40_state_blend_colour,
&nv40_state_zsa,
&nv40_state_sr,
&nv40_state_viewport,
&nv40_state_vtxfmt,
NULL
};
RENDER_STATES(nv30, nv30, vbo);
RENDER_STATES(nv30_swtnl, nv30, vbo); /* TODO: replace with vtxfmt once draw is unified */
RENDER_STATES(nv40, nv40, vbo);
RENDER_STATES(nv40_swtnl, nv40, vtxfmt);
static void
nv40_state_do_validate(struct nvfx_context *nvfx,
nvfx_state_do_validate(struct nvfx_context *nvfx,
struct nvfx_state_entry **states)
{
while (*states) {
@ -54,7 +44,7 @@ nv40_state_do_validate(struct nvfx_context *nvfx,
}
void
nv40_state_emit(struct nvfx_context *nvfx)
nvfx_state_emit(struct nvfx_context *nvfx)
{
struct nvfx_state *state = &nvfx->state;
struct nvfx_screen *screen = nvfx->screen;
@ -83,19 +73,21 @@ nv40_state_emit(struct nvfx_context *nvfx)
states &= ~(1ULL << i);
}
if (state->dirty & ((1ULL << NVFX_STATE_FRAGPROG) |
(1ULL << NVFX_STATE_FRAGTEX0))) {
BEGIN_RING(chan, eng3d, NV40TCL_TEX_CACHE_CTL, 1);
OUT_RING (chan, 2);
BEGIN_RING(chan, eng3d, NV40TCL_TEX_CACHE_CTL, 1);
OUT_RING (chan, 1);
/* TODO: could nv30 need this or something similar too? */
if(nvfx->is_nv4x) {
if (state->dirty & ((1ULL << NVFX_STATE_FRAGPROG) |
(1ULL << NVFX_STATE_FRAGTEX0))) {
BEGIN_RING(chan, eng3d, NV40TCL_TEX_CACHE_CTL, 1);
OUT_RING (chan, 2);
BEGIN_RING(chan, eng3d, NV40TCL_TEX_CACHE_CTL, 1);
OUT_RING (chan, 1);
}
}
state->dirty = 0;
}
void
nv40_state_flush_notify(struct nouveau_channel *chan)
nvfx_state_flush_notify(struct nouveau_channel *chan)
{
struct nvfx_context *nvfx = chan->user_private;
struct nvfx_state *state = &nvfx->state;
@ -115,7 +107,7 @@ nv40_state_flush_notify(struct nouveau_channel *chan)
}
boolean
nv40_state_validate(struct nvfx_context *nvfx)
nvfx_state_validate(struct nvfx_context *nvfx)
{
boolean was_sw = nvfx->fallback_swtnl ? TRUE : FALSE;
@ -135,10 +127,14 @@ nv40_state_validate(struct nvfx_context *nvfx)
nvfx->render_mode = HW;
}
nv40_state_do_validate(nvfx, render_states);
if(!nvfx->is_nv4x)
nvfx_state_do_validate(nvfx, nv30_render_states);
else
nvfx_state_do_validate(nvfx, nv40_render_states);
if (nvfx->fallback_swtnl || nvfx->fallback_swrast)
return FALSE;
if (was_sw)
NOUVEAU_ERR("swtnl->hw\n");
@ -146,7 +142,7 @@ nv40_state_validate(struct nvfx_context *nvfx)
}
boolean
nv40_state_validate_swtnl(struct nvfx_context *nvfx)
nvfx_state_validate_swtnl(struct nvfx_context *nvfx)
{
struct draw_context *draw = nvfx->draw;
@ -177,7 +173,11 @@ nv40_state_validate_swtnl(struct nvfx_context *nvfx)
draw_set_vertex_elements(draw, nvfx->vtxelt->num_elements, nvfx->vtxelt->pipe);
}
nv40_state_do_validate(nvfx, swtnl_states);
if(!nvfx->is_nv4x)
nvfx_state_do_validate(nvfx, nv30_swtnl_render_states);
else
nvfx_state_do_validate(nvfx, nv40_swtnl_render_states);
if (nvfx->fallback_swrast) {
NOUVEAU_ERR("swtnl->swrast 0x%08x\n", nvfx->fallback_swrast);
return FALSE;
@ -186,4 +186,3 @@ nv40_state_validate_swtnl(struct nvfx_context *nvfx)
nvfx->draw_dirty = 0;
return TRUE;
}