Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
src/gallium/drivers/nouveau/nvc0/nvc0_compute.c | 44 +++++++++----------------
src/gallium/drivers/nouveau/nvc0/nve4_compute.c | 41 +++++++++--------------
2 files changed, 31 insertions(+), 54 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
index f76a10c..e9db9c9 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
@@ -24,6 +24,7 @@
#include "nvc0/nvc0_context.h"
#include "nvc0/nvc0_compute.h"
+#include "nvc0/nvc0_state_validate.h"
int
nvc0_screen_compute_setup(struct nvc0_screen *screen,
@@ -259,35 +260,22 @@ nvc0_compute_validate_buffers(struct nvc0_context *nvc0)
}
}
+static struct nvc0_state_validate
+validate_list_cp[] = {
+ { nvc0_compute_validate_program, NVC0_NEW_CP_PROGRAM },
+ { nvc0_compute_validate_constbufs, NVC0_NEW_CP_CONSTBUF },
+ { nvc0_compute_validate_driverconst, NVC0_NEW_CP_DRIVERCONST },
+ { nvc0_compute_validate_buffers, NVC0_NEW_CP_BUFFERS },
+ { nvc0_compute_validate_textures, NVC0_NEW_CP_TEXTURES },
+ { nvc0_compute_validate_samplers, NVC0_NEW_CP_SAMPLERS },
+};
+
static bool
-nvc0_compute_state_validate(struct nvc0_context *nvc0)
+nvc0_state_validate_cp(struct nvc0_context *nvc0, uint32_t mask)
{
- nvc0_compute_validate_program(nvc0);
- if (nvc0->dirty_cp & NVC0_NEW_CP_CONSTBUF)
- nvc0_compute_validate_constbufs(nvc0);
- if (nvc0->dirty_cp & NVC0_NEW_CP_DRIVERCONST)
- nvc0_compute_validate_driverconst(nvc0);
- if (nvc0->dirty_cp & NVC0_NEW_CP_BUFFERS)
- nvc0_compute_validate_buffers(nvc0);
- if (nvc0->dirty_cp & NVC0_NEW_CP_TEXTURES)
- nvc0_compute_validate_textures(nvc0);
- if (nvc0->dirty_cp & NVC0_NEW_CP_SAMPLERS)
- nvc0_compute_validate_samplers(nvc0);
-
- /* TODO: surfaces, global memory buffers */
-
- nvc0_bufctx_fence(nvc0, nvc0->bufctx_cp, false);
-
- nouveau_pushbuf_bufctx(nvc0->base.pushbuf, nvc0->bufctx_cp);
- if (unlikely(nouveau_pushbuf_validate(nvc0->base.pushbuf)))
- return false;
- if (unlikely(nvc0->state.flushed_cp)) {
- nvc0->state.flushed_cp = false;
- nvc0_bufctx_fence(nvc0, nvc0->bufctx_cp, true);
- }
-
- return true;
-
+ return nvc0_state_validate(nvc0, mask, validate_list_cp,
+ ARRAY_SIZE(validate_list_cp), &nvc0->dirty_cp,
+ &nvc0->state.flushed_cp, nvc0->bufctx_cp);
}
static void
@@ -323,7 +311,7 @@ nvc0_launch_grid(struct pipe_context *pipe, const struct
pipe_grid_info *info)
unsigned s;
int ret;
- ret = !nvc0_compute_state_validate(nvc0);
+ ret = !nvc0_state_validate_cp(nvc0, ~0);
if (ret) {
NOUVEAU_ERR("Failed to launch grid !\n");
return;
diff --git a/src/gallium/drivers/nouveau/nvc0/nve4_compute.c
b/src/gallium/drivers/nouveau/nvc0/nve4_compute.c
index fae8c60..035ecf2 100644
--- a/src/gallium/drivers/nouveau/nvc0/nve4_compute.c
+++ b/src/gallium/drivers/nouveau/nvc0/nve4_compute.c
@@ -24,6 +24,7 @@
#include "nvc0/nvc0_context.h"
#include "nvc0/nvc0_compute.h"
+#include "nvc0/nvc0_state_validate.h"
#include "nvc0/nve4_compute.h"
#include "codegen/nv50_ir_driver.h"
@@ -317,36 +318,24 @@ nvc0_compute_validate_globals(struct nvc0_context *nvc0)
}
}
+static struct nvc0_state_validate
+validate_list_cp[] = {
+ { nvc0_compute_validate_program, NVC0_NEW_CP_PROGRAM },
+ { nve4_compute_validate_textures, NVC0_NEW_CP_TEXTURES },
+ { nve4_compute_validate_samplers, NVC0_NEW_CP_SAMPLERS },
+ { nve4_compute_set_tex_handles, NVC0_NEW_CP_TEXTURES |
NVC0_NEW_CP_SAMPLERS },
+ { nve4_compute_validate_surfaces, NVC0_NEW_CP_SURFACES },
+ { nvc0_compute_validate_globals, NVC0_NEW_CP_GLOBALS },
+};
static bool
-nve4_compute_state_validate(struct nvc0_context *nvc0)
+nve4_state_validate_cp(struct nvc0_context *nvc0, uint32_t mask)
{
- nvc0_compute_validate_program(nvc0);
- if (nvc0->dirty_cp & NVC0_NEW_CP_TEXTURES)
- nve4_compute_validate_textures(nvc0);
- if (nvc0->dirty_cp & NVC0_NEW_CP_SAMPLERS)
- nve4_compute_validate_samplers(nvc0);
- if (nvc0->dirty_cp & (NVC0_NEW_CP_TEXTURES | NVC0_NEW_CP_SAMPLERS))
- nve4_compute_set_tex_handles(nvc0);
- if (nvc0->dirty_cp & NVC0_NEW_CP_SURFACES)
- nve4_compute_validate_surfaces(nvc0);
- if (nvc0->dirty_cp & NVC0_NEW_CP_GLOBALS)
- nvc0_compute_validate_globals(nvc0);
-
- nvc0_bufctx_fence(nvc0, nvc0->bufctx_cp, false);
-
- nouveau_pushbuf_bufctx(nvc0->base.pushbuf, nvc0->bufctx_cp);
- if (unlikely(nouveau_pushbuf_validate(nvc0->base.pushbuf)))
- return false;
- if (unlikely(nvc0->state.flushed_cp)) {
- nvc0->state.flushed_cp = false;
- nvc0_bufctx_fence(nvc0, nvc0->bufctx_cp, true);
- }
-
- return true;
+ return nvc0_state_validate(nvc0, mask, validate_list_cp,
+ ARRAY_SIZE(validate_list_cp), &nvc0->dirty_cp,
+ &nvc0->state.flushed_cp, nvc0->bufctx_cp);
}
-
static void
nve4_compute_upload_input(struct nvc0_context *nvc0, const void *input,
const uint *block_layout,
@@ -465,7 +454,7 @@ nve4_launch_grid(struct pipe_context *pipe, const struct
pipe_grid_info *info)
BCTX_REFN_bo(nvc0->bufctx_cp, CP_DESC, NOUVEAU_BO_GART | NOUVEAU_BO_RD,
desc_bo);
- ret = !nve4_compute_state_validate(nvc0);
+ ret = !nve4_state_validate_cp(nvc0, ~0);
if (ret)
goto out;
--
2.6.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
