panfrost: Clamp shader->uniform_count

[mesa.git] / src / gallium / drivers / panfrost / pan_resource.h

diff --git a/src/gallium/drivers/panfrost/pan_resource.h b/src/gallium/drivers/panfrost/pan_resource.h
index ccf3af45082313b4813449c14edc35db86e5f3db..009f13c0f86afe2e76962fe15ef6c934bf1fbae0 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_resource.h
+++ b/src/gallium/drivers/panfrost/pan_resource.h
@@ -26,7 +26,7 @@
 #ifndef PAN_RESOURCE_H
 #define PAN_RESOURCE_H
 
-#include <panfrost-job.h>
+#include <midgard_pack.h>
 #include "pan_screen.h"
 #include "pan_pool.h"
 #include "pan_minmax_cache.h"
@@ -85,6 +85,10 @@ pan_resource(struct pipe_resource *p)
 struct panfrost_gtransfer {
         struct pipe_transfer base;
         void *map;
+        struct {
+                struct pipe_resource *rsrc;
+                struct pipe_box box;
+        } staging;
 };
 
 static inline struct panfrost_gtransfer *
@@ -118,26 +122,26 @@ panfrost_resource_set_damage_region(struct pipe_screen *screen,
                                     unsigned int nrects,
                                     const struct pipe_box *rects);
 
-static inline enum mali_texture_type
-panfrost_translate_texture_type(enum pipe_texture_target t) {
+static inline enum mali_texture_dimension
+panfrost_translate_texture_dimension(enum pipe_texture_target t) {
         switch (t)
         {
         case PIPE_BUFFER:
         case PIPE_TEXTURE_1D:
         case PIPE_TEXTURE_1D_ARRAY:
-                return MALI_TEX_1D;
+                return MALI_TEXTURE_DIMENSION_1D;
 
         case PIPE_TEXTURE_2D:
         case PIPE_TEXTURE_2D_ARRAY:
         case PIPE_TEXTURE_RECT:
-                return MALI_TEX_2D;
+                return MALI_TEXTURE_DIMENSION_2D;
 
         case PIPE_TEXTURE_3D:
-                return MALI_TEX_3D;
+                return MALI_TEXTURE_DIMENSION_3D;
 
         case PIPE_TEXTURE_CUBE:
         case PIPE_TEXTURE_CUBE_ARRAY:
-                return MALI_TEX_CUBE;
+                return MALI_TEXTURE_DIMENSION_CUBE;
 
         default:
                 unreachable("Unknown target");