freedreno/ir3: handle const/immed/abs/neg in cp

[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 a762c8f05755723c5ed4e546fc8ad60c29903cee..b3076b9f5c64a9b74540df6d571eb6e56ebfd54a 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_util.h
+++ b/src/gallium/drivers/freedreno/freedreno_util.h
@@ -57,15 +57,15 @@ enum adreno_stencil_op fd_stencil_op(unsigned op);
 #define FD_DBG_DISASM   0x0002
 #define FD_DBG_DCLEAR   0x0004
 #define FD_DBG_FLUSH    0x0008
-#define FD_DBG_DSCIS    0x0010
+#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_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_GLSL120  0x1000
+#define FD_DBG_NOCP     0x2000
 
 extern int fd_mesa_debug;
 extern bool fd_binning_enabled;
@@ -75,8 +75,6 @@ extern bool fd_binning_enabled;
                        debug_printf("%s:%d: "fmt "\n", \
                                __FUNCTION__, __LINE__, ##__VA_ARGS__); } while (0)
 
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
 /* for conditionally setting boolean flag(s): */
 #define COND(bool, val) ((bool) ? (val) : 0)
 
@@ -84,14 +82,16 @@ extern bool fd_binning_enabled;
 
 static inline uint32_t DRAW(enum pc_di_primtype prim_type,
                enum pc_di_src_sel source_select, enum pc_di_index_size index_size,
-               enum pc_di_vis_cull_mode vis_cull_mode)
+               enum pc_di_vis_cull_mode vis_cull_mode,
+               uint8_t instances)
 {
        return (prim_type         << 0) |
                        (source_select     << 6) |
                        ((index_size & 1)  << 11) |
                        ((index_size >> 1) << 13) |
                        (vis_cull_mode     << 9) |
-                       (1                 << 14);
+                       (1                 << 14) |
+                       (instances         << 24);
 }
 
 /* for tracking cmdstream positions that need to be patched: */
@@ -209,6 +209,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,7 +223,7 @@ 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);
 }
@@ -247,7 +251,7 @@ static inline uint32_t env2u(const char *envvar)
 {
        char *str = getenv(envvar);
        if (str)
-               return strtol(str, NULL, 0);
+               return strtoul(str, NULL, 0);
        return 0;
 }