vc4: Add support for 16-bit signed/unsigned norm/scaled vertex attrs.

[mesa.git] / src / gallium / drivers / freedreno / freedreno_util.h

diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h
index 43026c5575401fdd183e3f2d5233850dbeb6fa77..0abc53f6a8b2dfd74463be87ae6c8014378df854 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_util.h
+++ b/src/gallium/drivers/freedreno/freedreno_util.h
@@ -38,6 +38,7 @@
 #include "util/u_math.h"
 #include "util/u_half.h"
 #include "util/u_dynarray.h"
+#include "util/u_pack_color.h"
 
 #include "adreno_common.xml.h"
 #include "adreno_pm4.xml.h"
@@ -45,7 +46,6 @@
 enum adreno_rb_depth_format fd_pipe2depth(enum pipe_format format);
 enum pc_di_index_size fd_pipe2index(enum pipe_format format);
 enum adreno_rb_blend_factor fd_blend_factor(unsigned factor);
-enum adreno_rb_blend_opcode fd_blend_func(unsigned func);
 enum adreno_pa_su_sc_draw fd_polygon_mode(unsigned mode);
 enum adreno_stencil_op fd_stencil_op(unsigned op);
 
@@ -56,16 +56,17 @@ enum adreno_stencil_op fd_stencil_op(unsigned op);
 #define FD_DBG_MSGS     0x0001
 #define FD_DBG_DISASM   0x0002
 #define FD_DBG_DCLEAR   0x0004
-#define FD_DBG_DGMEM    0x0008
-#define FD_DBG_DSCIS    0x0010
+#define FD_DBG_FLUSH    0x0008
+#define FD_DBG_NOSCIS   0x0010
 #define FD_DBG_DIRECT   0x0020
-#define FD_DBG_DBYPASS  0x0040
+#define FD_DBG_NOBYPASS 0x0040
 #define FD_DBG_FRAGHALF 0x0080
-#define FD_DBG_BINNING  0x0100
-#define FD_DBG_DBINNING 0x0200
-#define FD_DBG_OPTIMIZE 0x0400
-#define FD_DBG_OPTMSGS  0x0800
-#define FD_DBG_OPTDUMP  0x1000
+#define FD_DBG_NOBIN    0x0100
+#define FD_DBG_NOOPT    0x0200
+#define FD_DBG_OPTMSGS  0x0400
+#define FD_DBG_OPTDUMP  0x0800
+#define FD_DBG_GLSL130  0x1000
+#define FD_DBG_NOCP     0x2000
 
 extern int fd_mesa_debug;
 extern bool fd_binning_enabled;
@@ -209,6 +210,10 @@ static inline void
 OUT_IB(struct fd_ringbuffer *ring, struct fd_ringmarker *start,
                struct fd_ringmarker *end)
 {
+       uint32_t dwords = fd_ringmarker_dwords(start, end);
+
+       assert(dwords > 0);
+
        /* for debug after a lock up, write a unique counter value
         * to scratch6 for each IB, to make it easier to match up
         * register dumps to cmdstream.  The combination of IB and
@@ -219,17 +224,44 @@ OUT_IB(struct fd_ringbuffer *ring, struct fd_ringmarker *start,
 
        OUT_PKT3(ring, CP_INDIRECT_BUFFER_PFD, 2);
        fd_ringbuffer_emit_reloc_ring(ring, start, end);
-       OUT_RING(ring, fd_ringmarker_dwords(start, end));
+       OUT_RING(ring, dwords);
 
        emit_marker(ring, 6);
 }
 
+/* CP_SCRATCH_REG4 is used to hold base address for query results: */
+#define HW_QUERY_BASE_REG REG_AXXX_CP_SCRATCH_REG4
+
 static inline void
 emit_marker(struct fd_ringbuffer *ring, int scratch_idx)
 {
        extern unsigned marker_cnt;
-       OUT_PKT0(ring, REG_AXXX_CP_SCRATCH_REG0 + scratch_idx, 1);
+       unsigned reg = REG_AXXX_CP_SCRATCH_REG0 + scratch_idx;
+       assert(reg != HW_QUERY_BASE_REG);
+       if (reg == HW_QUERY_BASE_REG)
+               return;
+       OUT_PKT0(ring, reg, 1);
        OUT_RING(ring, ++marker_cnt);
 }
 
+/* helper to get numeric value from environment variable..  mostly
+ * just leaving this here because it is helpful to brute-force figure
+ * out unknown formats, etc, which blob driver does not support:
+ */
+static inline uint32_t env2u(const char *envvar)
+{
+       char *str = getenv(envvar);
+       if (str)
+               return strtoul(str, NULL, 0);
+       return 0;
+}
+
+static inline uint32_t
+pack_rgba(enum pipe_format format, const float *rgba)
+{
+       union util_color uc;
+       util_pack_color(rgba, format, &uc);
+       return uc.ui[0];
+}
+
 #endif /* FREEDRENO_UTIL_H_ */