Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / gallium / drivers / freedreno / a3xx / fd3_emit.h

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_emit.h b/src/gallium/drivers/freedreno/a3xx/fd3_emit.h
index bf7787ab6f7c8b2ceb3311a392f5e09ce7e9eec6..795654706a75da64046758591b59bde4c22a8918 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_emit.h
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_emit.h
@@ -32,57 +32,62 @@
 #include "pipe/p_context.h"
 
 #include "freedreno_context.h"
-#include "fd3_util.h"
-
+#include "fd3_format.h"
+#include "fd3_program.h"
+#include "ir3_shader.h"
 
 struct fd_ringbuffer;
-enum adreno_state_block;
 
-void fd3_emit_constant(struct fd_ringbuffer *ring,
-               enum adreno_state_block sb,
+void fd3_emit_const(struct fd_ringbuffer *ring, enum shader_t type,
                uint32_t regid, uint32_t offset, uint32_t sizedwords,
                const uint32_t *dwords, struct pipe_resource *prsc);
 
 void fd3_emit_gmem_restore_tex(struct fd_ringbuffer *ring,
-               struct pipe_surface *psurf);
-
-/* NOTE: this just exists because we don't have proper vertex/vertexbuf
- * state objs for clear, and mem2gmem/gmem2mem operations..
- */
-struct fd3_vertex_buf {
-       unsigned offset, stride;
-       struct pipe_resource *prsc;
-       enum pipe_format format;
-};
+               struct pipe_surface **psurf, int bufs);
 
-void fd3_emit_vertex_bufs(struct fd_ringbuffer *ring,
-               struct fd_program_stateobj *prog,
-               struct fd3_vertex_buf *vbufs, uint32_t n);
-void fd3_emit_state(struct fd_context *ctx, uint32_t dirty);
-void fd3_emit_restore(struct fd_context *ctx);
+/* grouped together emit-state for prog/vertex/state emit: */
+struct fd3_emit {
+       const struct fd_vertex_state *vtx;
+       const struct fd_program_stateobj *prog;
+       const struct pipe_draw_info *info;
+       struct ir3_shader_key key;
+       uint32_t dirty;
 
+       uint32_t sprite_coord_enable;
+       bool sprite_coord_mode;
+       bool rasterflat;
 
-/* use RMW (read-modify-write) to update RB_RENDER_CONTROL since the
- * GMEM/binning code is deciding on the bin-width (and whether to
- * use binning) after the draw/clear state is emitted.
- */
+       /* cached to avoid repeated lookups of same variants: */
+       struct ir3_shader_variant *vp, *fp;
+};
 
-#define RBRC_DRAW_STATE  (A3XX_RB_RENDER_CONTROL_ALPHA_TEST | \
-               A3XX_RB_RENDER_CONTROL_ALPHA_TEST_FUNC__MASK)
+static inline struct ir3_shader_variant *
+fd3_emit_get_vp(struct fd3_emit *emit)
+{
+       if (!emit->vp) {
+               struct fd3_shader_stateobj *so = emit->prog->vp;
+               emit->vp = ir3_shader_variant(so->shader, emit->key);
+       }
+       return emit->vp;
+}
 
-static inline void
-fd3_emit_rbrc_draw_state(struct fd_context *ctx,
-               struct fd_ringbuffer *ring, uint32_t val)
+static inline struct ir3_shader_variant *
+fd3_emit_get_fp(struct fd3_emit *emit)
 {
-       assert(!(val & ~RBRC_DRAW_STATE));
-       if (val != ctx->rmw.rbrc_draw) {
-               fd_rmw_wfi(ctx, ring);
-               OUT_PKT3(ring, CP_REG_RMW, 3);
-               OUT_RING(ring, REG_A3XX_RB_RENDER_CONTROL);
-               OUT_RING(ring, ~RBRC_DRAW_STATE);
-               OUT_RING(ring, val);
-               ctx->rmw.rbrc_draw = val;
+       if (!emit->fp) {
+               struct fd3_shader_stateobj *so = emit->prog->fp;
+               emit->fp = ir3_shader_variant(so->shader, emit->key);
        }
+       return emit->fp;
 }
 
+void fd3_emit_vertex_bufs(struct fd_ringbuffer *ring, struct fd3_emit *emit);
+
+void fd3_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
+               struct fd3_emit *emit);
+
+void fd3_emit_restore(struct fd_context *ctx);
+
+void fd3_emit_init(struct pipe_context *pctx);
+
 #endif /* FD3_EMIT_H */