#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 *
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 *
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
setup_stages(emit, s);
- fssz = (s[FS].i->max_reg >= 24) ? TWO_QUADS : FOUR_QUADS;
+ fssz = FOUR_QUADS;
pos_regid = ir3_find_output_regid(s[VS].v, VARYING_SLOT_POS);
psize_regid = ir3_find_output_regid(s[VS].v, VARYING_SLOT_PSIZ);
OUT_PKT4(ring, REG_A6XX_GRAS_CNTL, 1);
OUT_RING(ring, COND(enable_varyings, A6XX_GRAS_CNTL_VARYING) |
- COND(s[FS].v->frag_coord, A6XX_GRAS_CNTL_XCOORD |
+ COND(s[FS].v->frag_coord,
+ A6XX_GRAS_CNTL_UNK3 |
+ A6XX_GRAS_CNTL_XCOORD |
A6XX_GRAS_CNTL_YCOORD |
A6XX_GRAS_CNTL_ZCOORD |
A6XX_GRAS_CNTL_WCOORD));
OUT_PKT4(ring, REG_A6XX_RB_RENDER_CONTROL0, 2);
OUT_RING(ring, COND(enable_varyings, A6XX_RB_RENDER_CONTROL0_VARYING |
A6XX_RB_RENDER_CONTROL0_UNK10) |
- COND(s[FS].v->frag_coord, A6XX_RB_RENDER_CONTROL0_XCOORD |
+ COND(s[FS].v->frag_coord,
+ A6XX_RB_RENDER_CONTROL0_UNK3 |
+ A6XX_RB_RENDER_CONTROL0_XCOORD |
A6XX_RB_RENDER_CONTROL0_YCOORD |
A6XX_RB_RENDER_CONTROL0_ZCOORD |
A6XX_RB_RENDER_CONTROL0_WCOORD));