Earlier gen's already got this cleanup, but a6xx was still off on a
branch then.
Signed-off-by: Rob Clark <robdclark@gmail.com>
fd6_emit_get_vp(struct fd6_emit *emit)
{
if (!emit->vp) {
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);
static const struct ir3_shader_variant binning_fp = {};
emit->fp = &binning_fp;
} else {
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);
#include "fd6_texture.h"
#include "fd6_format.h"
#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;
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
fd6_fp_state_delete(struct pipe_context *pctx, void *hwcso)
{
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
fd6_vp_state_delete(struct pipe_context *pctx, void *hwcso)
{
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);
#include "freedreno_context.h"
#include "ir3_shader.h"
#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);
struct fd6_emit;
void fd6_emit_shader(struct fd_ringbuffer *ring, const struct ir3_shader_variant *so);