Mesa (main): v3d: do not tile 1D textures

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: e6bcb8ad15d0d2645cf973ada23590616b10ac4d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6bcb8ad15d0d2645cf973ada23590616b10ac4d

Author: Juan A. Suarez Romero <jasuarez at igalia.com>
Date:   Tue Mar 29 13:53:27 2022 +0200

v3d: do not tile 1D textures

Hardware already support 1D untiled textures, so no need to convert them
to tile for render-based blit.

Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15693>

---

 src/broadcom/ci/broadcom-rpi4-fails.txt | 4 ----
 src/gallium/drivers/v3d/v3d_blit.c      | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt
index 00e8a547c7e..ef5d12ebf0c 100644
--- a/src/broadcom/ci/broadcom-rpi4-fails.txt
+++ b/src/broadcom/ci/broadcom-rpi4-fails.txt
@@ -140,8 +140,6 @@ spec at arb_depth_texture@texwrap formats at GL_DEPTH_COMPONENT16- NPOT,Fail
 spec at arb_depth_texture@texwrap formats at GL_DEPTH_COMPONENT24- NPOT,Fail
 spec at arb_depth_texture@texwrap formats at GL_DEPTH_COMPONENT32- NPOT,Fail
 spec at arb_framebuffer_object@fbo-drawbuffers-none use_frag_out,Fail
-spec at arb_pixel_buffer_object@pbo-getteximage,Fail
-spec at arb_pixel_buffer_object@texsubimage array pbo,Fail
 spec at arb_point_sprite@arb_point_sprite-checkerboard,Fail
 spec at arb_point_sprite@arb_point_sprite-mipmap,Fail
 spec at arb_shader_storage_buffer_object@compiler at atomicmin-swizzle.vert,Fail
@@ -238,10 +236,8 @@ spec at ext_packed_depth_stencil@texwrap formats bordercolor-swizzled at GL_DEPTH24_ST
 spec at ext_packed_depth_stencil@texwrap formats,Fail
 spec at ext_packed_depth_stencil@texwrap formats at GL_DEPTH24_STENCIL8- NPOT,Fail
 spec at ext_packed_float@query-rgba-signed-components,Fail
-spec at ext_texture_array@array-texture,Fail
 spec at ext_texture_array@fbo-generatemipmap-array rgb9_e5,Fail
 spec at ext_texture_array@fbo-generatemipmap-array,Fail
-spec at ext_texture_array@texsubimage array,Fail
 spec at ext_texture_integer@getteximage-clamping gl_arb_texture_rg,Fail
 spec at ext_texture_integer@getteximage-clamping,Fail
 spec at ext_texture_lod_bias@lodbias,Fail
diff --git a/src/gallium/drivers/v3d/v3d_blit.c b/src/gallium/drivers/v3d/v3d_blit.c
index 83af380b9d2..00bf21fb885 100644
--- a/src/gallium/drivers/v3d/v3d_blit.c
+++ b/src/gallium/drivers/v3d/v3d_blit.c
@@ -69,7 +69,9 @@ v3d_render_blit(struct pipe_context *ctx, struct pipe_blit_info *info)
         if (!info->mask)
                 return;
 
-        if (!src->tiled) {
+        if (!src->tiled &&
+            info->src.resource->target != PIPE_TEXTURE_1D &&
+            info->src.resource->target != PIPE_TEXTURE_1D_ARRAY) {
                 struct pipe_box box = {
                         .x = 0,
                         .y = 0,