nir/i965/freedreno/vc4: add a bindless bool to type size functions

[mesa.git] / src / gallium / drivers / panfrost / pan_swizzle.c

diff --git a/src/gallium/drivers/panfrost/pan_swizzle.c b/src/gallium/drivers/panfrost/pan_swizzle.c
index afc89506b336800cdb82e2cc9a81cbb660a97309..52a907ddd55d14c26f2b89d37b2c2718f2b873dc 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_swizzle.c
+++ b/src/gallium/drivers/panfrost/pan_swizzle.c
@@ -97,6 +97,9 @@ swizzle_bpp1_align16(int width, int height, int source_stride, int block_pitch,
 
                 ++y;
 
+                if (y >= height)
+                        break;
+
                 {
                         int block_y = y & ~(0x0f);
                         int rem_y = y & 0x0f;
@@ -149,15 +152,18 @@ swizzle_bpp4_align16(int width, int height, int source_stride, int block_pitch,
 void
 panfrost_texture_swizzle(unsigned off_x,
                          unsigned off_y,
-                         int width, int height, int bytes_per_pixel, int source_stride, int dest_width,
+                         int width, int height, int bytes_per_pixel, int dest_width,
                          const uint8_t *pixels,
                          uint8_t *ldest)
 {
         /* Calculate maximum size, overestimating a bit */
         int block_pitch = ALIGN(dest_width, 16) >> 4;
 
+        /* Strides must be tight, since we're only ever called indirectly */
+        int source_stride = width * bytes_per_pixel;
+
         /* Use fast path if available */
-        if (!(off_x || off_y)) {
+        if (!(off_x || off_y) && (width == dest_width)) {
                 if (bytes_per_pixel == 4 /* && (ALIGN(width, 16) == width) */) {
                         swizzle_bpp4_align16(width, height, source_stride >> 2, (block_pitch * 256 >> 4), (const uint32_t *) pixels, (uint32_t *) ldest);
                         return;