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 a762c8f05755723c5ed4e546fc8ad60c29903cee..0abc53f6a8b2dfd74463be87ae6c8014378df854 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_util.h
+++ b/src/gallium/drivers/freedreno/freedreno_util.h
@@ -57,15 +57,16 @@ 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_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,7 +224,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 +252,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;
 }