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

nv50: add a new validation path for compute

Browse Source 
This makes use of the new state validation interface to be consistent
with 3d.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Pierre Moreau <pierre.morrow@free.fr>
Tested-by: Pierre Moreau <pierre.morrow@free.fr>
This commit is contained in:
Samuel Pitoiset
2016-03-15 15:03:26 +01:00
parent 5ed387675d
commit af0c97fb90
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gallium/drivers/nouveau/nv50/nv50_compute.c
View File

@@ -170,24 +170,25 @@ nv50_compute_validate_globals(struct nv50_context *nv50)
} }
} }
static struct nv50_state_validate
validate_list_cp[] = {
{ nv50_compprog_validate, NV50_NEW_CP_PROGRAM },
{ nv50_compute_validate_globals, NV50_NEW_CP_GLOBALS },
};
static bool static bool
nv50_compute_state_validate(struct nv50_context *nv50) nv50_state_validate_cp(struct nv50_context *nv50, uint32_t mask)
{ {
nv50_compprog_validate(nv50); bool ret;
if (nv50->dirty_cp & NV50_NEW_CP_GLOBALS)
nv50_compute_validate_globals(nv50);
/* TODO: validate textures, samplers, surfaces */ /* TODO: validate textures, samplers, surfaces */
ret = nv50_state_validate(nv50, mask, validate_list_cp,
ARRAY_SIZE(validate_list_cp), &nv50->dirty_cp,
nv50->bufctx_cp);
nv50_bufctx_fence(nv50->bufctx_cp, false);
nouveau_pushbuf_bufctx(nv50->base.pushbuf, nv50->bufctx_cp);
if (unlikely(nouveau_pushbuf_validate(nv50->base.pushbuf)))
return false;
if (unlikely(nv50->state.flushed)) if (unlikely(nv50->state.flushed))
nv50_bufctx_fence(nv50->bufctx_cp, true); nv50_bufctx_fence(nv50->bufctx_cp, true);
return ret;
return true;
} }
static void static void
@@ -248,7 +249,7 @@ nv50_launch_grid(struct pipe_context *pipe, const struct pipe_grid_info *info)
struct nv50_program *cp = nv50->compprog; struct nv50_program *cp = nv50->compprog;
bool ret; bool ret;
ret = !nv50_compute_state_validate(nv50); ret = !nv50_state_validate_cp(nv50, ~0);
if (ret) { if (ret) {
NOUVEAU_ERR("Failed to launch grid !\n"); NOUVEAU_ERR("Failed to launch grid !\n");
return; return;