OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvc0: rework the validation path for 3D

Browse Source 
This exposes an interface for state validation that will be also used
to rework the compute validation path.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Samuel Pitoiset
2016-03-08 21:36:06 +01:00
parent a100a57e30
commit db9b41d302
4 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/nouveau/nvc0/nvc0_context.h
View File

@@ -262,7 +262,15 @@ void nvc0_tfb_validate(struct nvc0_context *);
extern void nvc0_init_state_functions(struct nvc0_context *); extern void nvc0_init_state_functions(struct nvc0_context *);
/* nvc0_state_validate.c */ /* nvc0_state_validate.c */
bool nvc0_state_validate(struct nvc0_context *, uint32_t state_mask); struct nvc0_state_validate {
void (*func)(struct nvc0_context *);
uint32_t states;
};
bool nvc0_state_validate(struct nvc0_context *, uint32_t,
struct nvc0_state_validate *, int, uint32_t *,
struct nouveau_bufctx *);
bool nvc0_state_validate_3d(struct nvc0_context *, uint32_t);
/* nvc0_surface.c */ /* nvc0_surface.c */
extern void nvc0_clear(struct pipe_context *, unsigned buffers, extern void nvc0_clear(struct pipe_context *, unsigned buffers,

36
src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
View File

@@ -672,10 +672,8 @@ nvc0_switch_pipe_context(struct nvc0_context *ctx_to)
ctx_to->screen->cur_ctx = ctx_to; ctx_to->screen->cur_ctx = ctx_to;
} }
static struct state_validate { static struct nvc0_state_validate
void (*func)(struct nvc0_context *); validate_list_3d[] = {
uint32_t states;
} validate_list[] = {
{ nvc0_validate_fb, NVC0_NEW_3D_FRAMEBUFFER }, { nvc0_validate_fb, NVC0_NEW_3D_FRAMEBUFFER },
{ nvc0_validate_blend, NVC0_NEW_3D_BLEND }, { nvc0_validate_blend, NVC0_NEW_3D_BLEND },
{ nvc0_validate_zsa, NVC0_NEW_3D_ZSA }, { nvc0_validate_zsa, NVC0_NEW_3D_ZSA },
@@ -714,7 +712,9 @@ static struct state_validate {
}; };
bool bool
nvc0_state_validate(struct nvc0_context *nvc0, uint32_t mask) nvc0_state_validate(struct nvc0_context *nvc0, uint32_t mask,
struct nvc0_state_validate *validate_list, int size,
uint32_t *dirty, struct nouveau_bufctx *bufctx)
{ {
uint32_t state_mask; uint32_t state_mask;
int ret; int ret;
@@ -723,26 +723,38 @@ nvc0_state_validate(struct nvc0_context *nvc0, uint32_t mask)
if (nvc0->screen->cur_ctx != nvc0) if (nvc0->screen->cur_ctx != nvc0)
nvc0_switch_pipe_context(nvc0); nvc0_switch_pipe_context(nvc0);
state_mask = nvc0->dirty_3d & mask; state_mask = *dirty & mask;
if (state_mask) { if (state_mask) {
for (i = 0; i < ARRAY_SIZE(validate_list); ++i) { for (i = 0; i < size; ++i) {
struct state_validate *validate = &validate_list[i]; struct nvc0_state_validate *validate = &validate_list[i];
if (state_mask & validate->states) if (state_mask & validate->states)
validate->func(nvc0); validate->func(nvc0);
} }
nvc0->dirty_3d &= ~state_mask; *dirty &= ~state_mask;
nvc0_bufctx_fence(nvc0, nvc0->bufctx_3d, false); nvc0_bufctx_fence(nvc0, bufctx, false);
} }
nouveau_pushbuf_bufctx(nvc0->base.pushbuf, nvc0->bufctx_3d); nouveau_pushbuf_bufctx(nvc0->base.pushbuf, bufctx);
ret = nouveau_pushbuf_validate(nvc0->base.pushbuf); ret = nouveau_pushbuf_validate(nvc0->base.pushbuf);
return !ret;
}
bool
nvc0_state_validate_3d(struct nvc0_context *nvc0, uint32_t mask)
{
bool ret;
ret = nvc0_state_validate(nvc0, mask, validate_list_3d,
ARRAY_SIZE(validate_list_3d), &nvc0->dirty_3d,
nvc0->bufctx_3d);
if (unlikely(nvc0->state.flushed)) { if (unlikely(nvc0->state.flushed)) {
nvc0->state.flushed = false; nvc0->state.flushed = false;
nvc0_bufctx_fence(nvc0, nvc0->bufctx_3d, true); nvc0_bufctx_fence(nvc0, nvc0->bufctx_3d, true);
} }
return !ret; return ret;
} }

4
src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
View File

@@ -693,7 +693,7 @@ nvc0_clear(struct pipe_context *pipe, unsigned buffers,
uint32_t mode = 0; uint32_t mode = 0;
/* don't need NEW_BLEND, COLOR_MASK doesn't affect CLEAR_BUFFERS */ /* don't need NEW_BLEND, COLOR_MASK doesn't affect CLEAR_BUFFERS */
if (!nvc0_state_validate(nvc0, NVC0_NEW_3D_FRAMEBUFFER)) if (!nvc0_state_validate_3d(nvc0, NVC0_NEW_3D_FRAMEBUFFER))
return; return;
if (buffers & PIPE_CLEAR_COLOR && fb->nr_cbufs) { if (buffers & PIPE_CLEAR_COLOR && fb->nr_cbufs) {
@@ -1195,7 +1195,7 @@ nvc0_blit_3d(struct nvc0_context *nvc0, const struct pipe_blit_info *info)
nvc0_blitctx_prepare_state(blit); nvc0_blitctx_prepare_state(blit);
nvc0_state_validate(nvc0, ~0); nvc0_state_validate_3d(nvc0, ~0);
x_range = (float)info->src.box.width / (float)info->dst.box.width; x_range = (float)info->src.box.width / (float)info->dst.box.width;
y_range = (float)info->src.box.height / (float)info->dst.box.height; y_range = (float)info->src.box.height / (float)info->dst.box.height;

2
src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c
View File

@@ -969,7 +969,7 @@ nvc0_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
IMMED_NVC0(push, NVC0_3D(PATCH_VERTICES), nvc0->state.patch_vertices); IMMED_NVC0(push, NVC0_3D(PATCH_VERTICES), nvc0->state.patch_vertices);
} }
nvc0_state_validate(nvc0, ~0); nvc0_state_validate_3d(nvc0, ~0);
if (nvc0->vertprog->vp.need_draw_parameters) { if (nvc0->vertprog->vp.need_draw_parameters) {
PUSH_SPACE(push, 9); PUSH_SPACE(push, 9);