nir: Distinguish between normal uniforms and UBOs

[mesa.git] / src / gallium / drivers / vc4 / vc4_simulator_validate.h

diff --git a/src/gallium/drivers/vc4/vc4_simulator_validate.h b/src/gallium/drivers/vc4/vc4_simulator_validate.h
index 2bb36b253bba848d66c6ef0b2e71ee029b77eb51..e2777cd54326fcb810783a537f318d890e2a3598 100644 (file)
--- a/src/gallium/drivers/vc4/vc4_simulator_validate.h
+++ b/src/gallium/drivers/vc4/vc4_simulator_validate.h
@@ -45,8 +45,26 @@ struct vc4_exec_info;
 #define roundup(x, y) align(x, y)
 #define round_up(x, y) align(x, y)
 #define max(x, y) MAX2(x, y)
-#define min(x, y) MiN2(x, y)
+#define min(x, y) MIN2(x, y)
 #define BUG_ON(condition) assert(!(condition))
+#define BIT(bit) (1u << bit)
+
+/* Unsigned long-based bitmap interface in the linux kernel */
+#define BITMAP_WORDBITS (sizeof(unsigned long) * 8)
+#define BITS_TO_LONGS(bits) (roundup(bits, BITMAP_WORDBITS) / \
+                             sizeof(unsigned long))
+static inline bool
+test_bit(unsigned int bit, unsigned long *addr)
+{
+        return addr[bit / BITMAP_WORDBITS] & (1ul << (bit % BITMAP_WORDBITS));
+}
+
+static inline bool
+set_bit(unsigned int bit, unsigned long *addr)
+{
+        return addr[bit / BITMAP_WORDBITS] |= (1ul << (bit % BITMAP_WORDBITS));
+}
+
 
 static inline int
 copy_from_user(void *dst, void *src, size_t size)
@@ -60,12 +78,11 @@ typedef uint16_t u16;
 typedef uint32_t u32;
 
 struct drm_device {
-        struct vc4_context *vc4;
-        uint32_t simulator_mem_next;
+        struct vc4_screen *screen;
 };
 
 struct drm_gem_object {
-        uint32_t size;
+        size_t size;
         struct drm_device *dev;
 };
 
@@ -77,7 +94,7 @@ struct drm_gem_cma_object {
 
 struct drm_vc4_bo {
         struct drm_gem_cma_object base;
-        struct vc4_bo *bo;
+        struct vc4_validated_shader_info *validated_shader;
         struct list_head unref_head;
 };