Mesa (master): freedreno/a6xx: remove fd6_shader_stateobj
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Oct 8 23:09:11 UTC 2018
Module: Mesa
Branch: master
Commit: d5bd3ce89cedb43520b49c58bb28fbee45271993
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d5bd3ce89cedb43520b49c58bb28fbee45271993
Author: Rob Clark <robdclark at gmail.com>
Date: Tue Oct 2 14:31:20 2018 -0400
freedreno/a6xx: remove fd6_shader_stateobj
Earlier gen's already got this cleanup, but a6xx was still off on a
branch then.
Signed-off-by: Rob Clark <robdclark at gmail.com>
---
src/gallium/drivers/freedreno/a6xx/fd6_emit.h | 8 ++++----
src/gallium/drivers/freedreno/a6xx/fd6_program.c | 21 ++++++---------------
src/gallium/drivers/freedreno/a6xx/fd6_program.h | 4 ----
3 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h
index a603017dd8..d50401327e 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.h
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.h
@@ -76,8 +76,8 @@ static inline const struct ir3_shader_variant *
fd6_emit_get_vp(struct fd6_emit *emit)
{
if (!emit->vp) {
- struct fd6_shader_stateobj *so = emit->prog->vp;
- emit->vp = ir3_shader_variant(so->shader, emit->key, emit->debug);
+ struct ir3_shader *shader = emit->prog->vp;
+ emit->vp = ir3_shader_variant(shader, emit->key, emit->debug);
}
return emit->vp;
}
@@ -91,8 +91,8 @@ fd6_emit_get_fp(struct fd6_emit *emit)
static const struct ir3_shader_variant binning_fp = {};
emit->fp = &binning_fp;
} else {
- struct fd6_shader_stateobj *so = emit->prog->fp;
- emit->fp = ir3_shader_variant(so->shader, emit->key, emit->debug);
+ struct ir3_shader *shader = emit->prog->fp;
+ emit->fp = ir3_shader_variant(shader, emit->key,emit->debug);
}
}
return emit->fp;
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.c b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
index 6ce02d6321..cbb561a3b8 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_program.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
@@ -39,22 +39,13 @@
#include "fd6_texture.h"
#include "fd6_format.h"
-static void
-delete_shader_stateobj(struct fd6_shader_stateobj *so)
-{
- ir3_shader_destroy(so->shader);
- free(so);
-}
-
-static struct fd6_shader_stateobj *
+static struct ir3_shader *
create_shader_stateobj(struct pipe_context *pctx, const struct pipe_shader_state *cso,
enum shader_t type)
{
struct fd_context *ctx = fd_context(pctx);
struct ir3_compiler *compiler = ctx->screen->compiler;
- struct fd6_shader_stateobj *so = CALLOC_STRUCT(fd6_shader_stateobj);
- so->shader = ir3_shader_create(compiler, cso, type, &ctx->debug);
- return so;
+ return ir3_shader_create(compiler, cso, type, &ctx->debug);
}
static void *
@@ -67,8 +58,8 @@ fd6_fp_state_create(struct pipe_context *pctx,
static void
fd6_fp_state_delete(struct pipe_context *pctx, void *hwcso)
{
- struct fd6_shader_stateobj *so = hwcso;
- delete_shader_stateobj(so);
+ struct ir3_shader *so = hwcso;
+ ir3_shader_destroy(so);
}
static void *
@@ -81,8 +72,8 @@ fd6_vp_state_create(struct pipe_context *pctx,
static void
fd6_vp_state_delete(struct pipe_context *pctx, void *hwcso)
{
- struct fd6_shader_stateobj *so = hwcso;
- delete_shader_stateobj(so);
+ struct ir3_shader *so = hwcso;
+ ir3_shader_destroy(so);
}
void
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.h b/src/gallium/drivers/freedreno/a6xx/fd6_program.h
index fa4f84fee2..4e7afe78dc 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_program.h
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.h
@@ -32,10 +32,6 @@
#include "freedreno_context.h"
#include "ir3_shader.h"
-struct fd6_shader_stateobj {
- struct ir3_shader *shader;
-};
-
struct fd6_emit;
void fd6_emit_shader(struct fd_ringbuffer *ring, const struct ir3_shader_variant *so);
More information about the mesa-commit
mailing list