From e6bcb8ad15d0d2645cf973ada23590616b10ac4d Mon Sep 17 00:00:00 2001 From: "Juan A. Suarez Romero" Date: Tue, 29 Mar 2022 13:53:27 +0200 Subject: [PATCH] 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 Reviewed-by: Iago Toral Quiroga Part-of: --- 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@arb_depth_texture@texwrap formats@GL_DEPTH_COMPONENT16- NPOT,Fail spec@arb_depth_texture@texwrap formats@GL_DEPTH_COMPONENT24- NPOT,Fail spec@arb_depth_texture@texwrap formats@GL_DEPTH_COMPONENT32- NPOT,Fail spec@arb_framebuffer_object@fbo-drawbuffers-none use_frag_out,Fail -spec@arb_pixel_buffer_object@pbo-getteximage,Fail -spec@arb_pixel_buffer_object@texsubimage array pbo,Fail spec@arb_point_sprite@arb_point_sprite-checkerboard,Fail spec@arb_point_sprite@arb_point_sprite-mipmap,Fail spec@arb_shader_storage_buffer_object@compiler@atomicmin-swizzle.vert,Fail @@ -238,10 +236,8 @@ spec@ext_packed_depth_stencil@texwrap formats bordercolor-swizzled@GL_DEPTH24_ST spec@ext_packed_depth_stencil@texwrap formats,Fail spec@ext_packed_depth_stencil@texwrap formats@GL_DEPTH24_STENCIL8- NPOT,Fail spec@ext_packed_float@query-rgba-signed-components,Fail -spec@ext_texture_array@array-texture,Fail spec@ext_texture_array@fbo-generatemipmap-array rgb9_e5,Fail spec@ext_texture_array@fbo-generatemipmap-array,Fail -spec@ext_texture_array@texsubimage array,Fail spec@ext_texture_integer@getteximage-clamping gl_arb_texture_rg,Fail spec@ext_texture_integer@getteximage-clamping,Fail spec@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,