From 0763fb947a338c50eef69f5af6d9a20204ef4b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Ondra=C4=8Dka?= Date: Fri, 13 Feb 2026 15:26:14 +0100 Subject: [PATCH] r300: align macro-tiled stride-addressed textures in X Odd macro-tile counts in X trigger flaky rendering/readback in parallel stress runs with macro-tiled NPOT textures (for example piglit draw-pixel-with-texture -auto -fbo). When a texture is macro-tiled and uses stride addressing, align the width to two macro tiles. This keeps the stride at an even number of macro tiles in X and avoids the corruption without disabling macrotiling. I was not able to find anything about this in the docs. Cc: mesa-stable Part-of: --- .../drivers/r300/ci/r300-rs740-fails.txt | 44 --------- .../drivers/r300/ci/r300-rs740-flakes.txt | 85 ---------------- .../drivers/r300/ci/r300-rv410-fails.txt | 40 -------- .../drivers/r300/ci/r300-rv410-flakes.txt | 75 +------------- .../r300/ci/r300-rv530-nohiz-fails.txt | 49 --------- .../r300/ci/r300-rv530-nohiz-flakes.txt | 99 ------------------- src/gallium/drivers/r300/r300_texture_desc.c | 6 ++ 7 files changed, 7 insertions(+), 391 deletions(-) diff --git a/src/gallium/drivers/r300/ci/r300-rs740-fails.txt b/src/gallium/drivers/r300/ci/r300-rs740-fails.txt index 6104a44737b..e7d30f48fe0 100644 --- a/src/gallium/drivers/r300/ci/r300-rs740-fails.txt +++ b/src/gallium/drivers/r300/ci/r300-rs740-fails.txt @@ -493,7 +493,6 @@ dEQP-GLES2.functional.uniform_api.info_query.nested_structs_arrays.mat4_mat2_bot dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.nested_structs_arrays.mat4_mat2_both,Fail dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.nested_structs_arrays.mat4_mat2_both,Fail - # Piglit gpu tests shaders@glsl-arb-fragment-coord-conventions,Fail @@ -502,7 +501,6 @@ shaders@glsl-fs-fogscale@vs and fs,Fail shaders@glsl-fs-loop,Fail shaders@glsl-fs-loop-nested,Fail shaders@glsl-fwidth,Fail -shaders@glsl-lod-bias,Fail shaders@glsl-max-varyings >max_varying_components,Fail shaders@glsl-max-varyings,Fail shaders@glsl-uniform-interstage-limits@subdivide 5,Fail @@ -514,13 +512,11 @@ shaders@ssa@fs-lost-copy-problem,Fail shaders@ssa@fs-swap-problem,Fail shaders@ssa@fs-while-loop-rotate-value,Fail - spec@!opengl 1.0@depth-clear-precision-check,Fail spec@!opengl 1.0@depth-clear-precision-check@depth16,Fail spec@!opengl 1.0@depth-clear-precision-check@depth24,Fail spec@!opengl 1.0@depth-clear-precision-check@depth24_stencil8,Fail spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail -spec@!opengl 1.0@gl-1.0-blend-func,Fail spec@!opengl 1.0@gl-1.0-drawbuffer-modes,Fail spec@!opengl 1.0@gl-1.0-no-op-paths,Fail @@ -542,10 +538,7 @@ spec@!opengl 1.1@depthstencil-default_fb-readpixels-24_8 samples=6,Fail spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=2,Fail spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=4,Fail spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=6,Fail -spec@!opengl 1.1@draw-pixel-with-texture,Fail spec@!opengl 1.1@getteximage-formats,Fail -spec@!opengl 1.1@getteximage-simple,Fail -spec@!opengl 1.1@gl-1.2-texture-base-level,Fail spec@!opengl 1.1@line-aa-width,Fail spec@!opengl 1.1@line-smooth-stipple,Fail spec@!opengl 1.1@polygon-mode-offset,Fail @@ -568,19 +561,14 @@ spec@!opengl 1.1@texwrap formats bordercolor@GL_RGBA16- border color only,Fail spec@!opengl 1.2@lodclamp-between,Fail spec@!opengl 1.2@lodclamp-between-max,Fail -spec@!opengl 1.2@tex3d,Fail spec@!opengl 1.2@texwrap 3d,Fail spec@!opengl 1.2@texwrap 3d@GL_RGBA8- NPOT,Fail spec@!opengl 1.2@texwrap 3d proj,Fail spec@!opengl 1.2@texwrap 3d proj@GL_RGBA8- NPOT- projected,Fail -spec@!opengl 1.4@tex-miplevel-selection,Fail -spec@!opengl 1.4@tex-miplevel-selection-lod,Fail -spec@!opengl 1.4@tex-miplevel-selection-lod-bias,Fail spec@!opengl 1.4@triangle-rasterization,Fail spec@!opengl 1.4@triangle-rasterization-fbo,Fail -spec@!opengl 2.0@depth-tex-modes-glsl,Fail spec@!opengl 2.0@gl-2.0-two-sided-stencil,Fail spec@!opengl 2.0@occlusion-query-discard,Fail spec@!opengl 2.0@tex3d-npot,Fail @@ -600,8 +588,6 @@ spec@arb_color_buffer_float@gl_rgba32f-render-sanity-fog,Fail spec@arb_color_buffer_float@gl_rgba8_snorm-render-sanity,Fail spec@arb_color_buffer_float@gl_rgba8_snorm-render-sanity-fog,Fail -spec@arb_draw_buffers@fbo-mrt-alphatest,Fail - spec@arb_fragment_coord_conventions@fp-arb-fragment-coord-conventions-integer,Fail spec@arb_fragment_program@fp-indirections2,Fail @@ -630,8 +616,6 @@ spec@arb_point_parameters@arb_point_parameters-point-attenuation@Antialiased com spec@arb_point_sprite@arb_point_sprite-mipmap,Fail -spec@arb_sampler_objects@sampler-incomplete,Fail - spec@arb_texture_compression_bptc@texwrap formats bordercolor,Fail spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled,Fail spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT- swizzled- border color only,Fail @@ -689,9 +673,6 @@ spec@arb_texture_rectangle@1-1-linear-texture,Fail spec@arb_texture_rectangle@copyteximage rect samples=2,Fail spec@arb_texture_rectangle@copyteximage rect samples=4,Fail spec@arb_texture_rectangle@copyteximage rect samples=6,Fail -spec@arb_texture_rectangle@tex-miplevel-selection gl2:texture() 2drect,Fail -spec@arb_texture_rectangle@tex-miplevel-selection gl2:textureproj 2drect,Fail -spec@arb_texture_rectangle@tex-miplevel-selection gl2:textureproj 2drectshadow,Fail spec@arb_texture_rg@fbo-alphatest-formats,Fail spec@arb_texture_rg@fbo-alphatest-formats@GL_R16,Fail @@ -712,20 +693,11 @@ spec@arb_texture_rg@texwrap formats-float bordercolor@GL_R32F- border color only spec@arb_texture_rg@texwrap formats-float bordercolor@GL_RG16F- border color only,Fail spec@arb_texture_rg@texwrap formats-float bordercolor@GL_RG32F- border color only,Fail -spec@ati_fragment_shader@ati_fragment_shader-render-notexture,Fail -spec@ati_fragment_shader@ati_fragment_shader-render-textargets,Fail - spec@egl 1.4@eglterminate then unbind context,Fail spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_rgba,Fail spec@egl_khr_surfaceless_context@viewport,Fail -spec@ext_direct_state_access@multi-texture,Fail -spec@ext_direct_state_access@multi-texture@CopyMultiTexImage1DEXT + display list GL_COMPILE,Fail -spec@ext_direct_state_access@multi-texture@CopyMultiTexSubImage1DEXT + display list GL_COMPILE,Fail -spec@ext_direct_state_access@textures,Fail -spec@ext_direct_state_access@textures@CopyTextureImage1DEXT + display list GL_COMPILE,Fail -spec@ext_direct_state_access@textures@CopyTextureSubImage1DEXT + display list GL_COMPILE,Fail spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail @@ -769,9 +741,6 @@ spec@ext_occlusion_query_boolean@any-samples,Fail spec@ext_packed_depth_stencil@depth_stencil texture,Fail -spec@ext_texture_compression_s3tc@s3tc-errors,Fail -spec@ext_texture_compression_s3tc@s3tc-errors_gles2,Fail - spec@ext_texture_format_bgra8888@api-errors,Fail spec@ext_texture_snorm@fbo-alphatest-formats,Fail @@ -1082,15 +1051,8 @@ spec@glsl-1.20@execution@vs-loop-uint-induction-var-3,Fail spec@glsl-1.20@execution@vs-loop-uint-induction-var-4,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() cube,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) 1d,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) 1dshadow,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) cube,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d_projvec4,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 1d,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 1d_projvec4,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 1dshadow,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 2d,Fail spec@glsl-1.20@execution@built-in-functions@fs-matrixcompmult-mat2x3-mat2x3,Fail spec@glsl-1.20@execution@built-in-functions@fs-matrixcompmult-mat2x4-mat2x4,Fail @@ -1202,7 +1164,6 @@ spec@glsl-1.20@execution@built-in-functions@fs-outerproduct-vec4-vec4,Fail spec@glsl-1.20@execution@fs-underflow-mul-compare-zero,Fail spec@glsl-1.20@execution@fs-vec4-const-array-indirect-access-256-elements,Fail spec@glsl-1.20@execution@glsl-fs-frontfacing,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 2dshadow,Fail spec@glsl-1.20@execution@uniform-initializer@fs-mat4-array,Fail spec@intel_performance_query@intel_performance_query-issue_2235,Fail @@ -1224,12 +1185,7 @@ spec@nv_primitive_restart@primitive-restart-draw-mode-lines,Fail spec@nv_primitive_restart@primitive-restart-draw-mode-quad_strip,Fail spec@nv_primitive_restart@primitive-restart-draw-mode-quads,Fail -spec@nv_texture_env_combine4@nv_texture_env_combine4-combine,Fail - -spec@oes_texture_float@oes_texture_float half,Fail - # uprev Piglit in Mesa -spec@!opengl 1.1@teximage-scale-bias,Fail spec@glsl-1.10@execution@glsl-fs-texture2d-mipmap-const-bias-01,Fail spec@glsl-1.10@execution@glsl-fs-texture2d-mipmap-const-bias-04,Fail spec@glsl-1.10@execution@glsl-fs-texture2d-mipmap-const-bias-05,Fail diff --git a/src/gallium/drivers/r300/ci/r300-rs740-flakes.txt b/src/gallium/drivers/r300/ci/r300-rs740-flakes.txt index 4610b6eca03..374cc40b36e 100644 --- a/src/gallium/drivers/r300/ci/r300-rs740-flakes.txt +++ b/src/gallium/drivers/r300/ci/r300-rs740-flakes.txt @@ -1,35 +1,3 @@ -dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.35 -dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.45 -dEQP-GLES2.functional.fragment_ops.random.77 - -# Unfortunately it looks like all tex-miplevel selection -# tests are very flaky. -spec@arb_texture_rectangle@tex-miplevel-selection* -spec@glsl-1.20@execution@tex-miplevel-selection* -spec@!opengl 1.4@tex-miplevel-selection -spec@!opengl 1.4@tex-miplevel-selection-lod -spec@!opengl 1.4@tex-miplevel-selection-lod-bias -spec@!opengl 2.1@pbo@test_draw_pixels -spec@arb_draw_buffers@fbo-mrt-alphatest -spec@arb_sampler_objects@sampler-incomplete -spec@oes_draw_elements_base_vertex@oes_draw_elements_base_vertex-drawelements -shaders@glsl-fs-bug25902 -shaders@glsl-lod-bias -spec@oes_texture_float@oes_texture_float -spec@ext_direct_state_access@textures* -spec@!opengl 1.1@texgen -spec@ati_fragment_shader@ati_fragment_shader-render-textargets -spec@ati_fragment_shader@ati_fragment_shader-render-notexture -spec@ext_texture_compression_s3tc@s3tc-errors_gles2 -fast_color_clear@fcc-front-buffer-distraction -shaders@glsl-vs-point-size -spec@khr_texture_compression_astc@miptree-gles hdr -spec@khr_texture_compression_astc@miptree-gles hdr@HDR Profile -spec@!opengl 1.2@tex3d-maxsize -spec@ext_framebuffer_object@fbo-readpixels -spec@!opengl 1.1@gl-1.2-texture-base-level -spec@!opengl 1.1@gl-1.1-read-pixels-after-display-list - # Uninitialized reads in FS, https://gitlab.freedesktop.org/mesa/mesa/-/issues/12047 spec@glsl-1.10@execution@fs-frontfacing-ternary-neg-1.0-1.0 spec@glsl-1.10@execution@fs-frontfacing-ternary-vec4-neg-1.0-1.0 @@ -40,56 +8,3 @@ dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.35 dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.88 dEQP-GLES2.functional.fragment_ops.random.77 dEQP-GLES2.functional.fragment_ops.scissor.contained_point -shaders@glsl-fs-bug25902 -spec@!opengl 1.1@gl-1.1-read-pixels-after-display-list -spec@!opengl 1.1@texgen -spec@!opengl 1.5@depth-tex-compare -spec@!opengl 2.0@incomplete-texture-glsl -spec@!opengl 2.1@pbo@test_draw_pixels -spec@arb_fragment_program@fp-formats -spec@arb_texture_rectangle@tex-miplevel-selection gl2:textureproj 2drect_projvec4 -spec@ati_fragment_shader@ati_fragment_shader-render-sources -spec@ext_framebuffer_object@fbo-stencil-gl_stencil_index8-drawpixels -spec@glsl-1.20@execution@built-in-functions@vs-op-div-mat4x3-mat4x3 -spec@glsl-1.20@execution@built-in-functions@vs-op-selection-bool-mat3x2-mat3x2 -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(\) 1d -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(\) 1dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(\) 2d -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(\) 2dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(bias\) 2d -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(bias\) 2dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 1d -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 1dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj\(bias\) 2d_projvec4 -spec@khr_texture_compression_astc@miptree-gl srgb-sd -spec@khr_texture_compression_astc@miptree-gl srgb-sd@sRGB skip decode -spec@nv_primitive_restart@primitive-restart-draw-mode-line_strip -spec@oes_texture_float@oes_texture_float - -spec@!opengl 1.0@gl-1.0-blend-func -spec@!opengl 1.0@gl-1.0-drawpixels-depth-test -spec@ext_texture_env_combine@texture-env-combine -spec@nv_primitive_restart@primitive-restart-draw-mode-line_loop -spec@nv_primitive_restart@primitive-restart-draw-mode-points -spec@nv_primitive_restart@primitive-restart-draw-mode-polygon -spec@nv_primitive_restart@primitive-restart-draw-mode-triangle_fan -spec@nv_primitive_restart@primitive-restart-draw-mode-triangle_strip -dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.17 -dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.20 -dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.63 -dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.64 -dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.86 - -# uprev Piglit in Mesa -spec@!opengl 1.1@teximage-scale-bias -spec@!opengl 1.2@tex3d-maxsize -spec@arb_texture_rectangle@tex-miplevel-selection gl2:texture() 2drectshadow -spec@ext_framebuffer_object@fbo-readpixels -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() 1d -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() 1dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() 2dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) 2dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 1d_projvec4 -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 2d_projvec4 -spec@nv_primitive_restart@primitive-restart-draw-mode-points - diff --git a/src/gallium/drivers/r300/ci/r300-rv410-fails.txt b/src/gallium/drivers/r300/ci/r300-rv410-fails.txt index 52e52444702..63a37b01505 100644 --- a/src/gallium/drivers/r300/ci/r300-rv410-fails.txt +++ b/src/gallium/drivers/r300/ci/r300-rv410-fails.txt @@ -485,7 +485,6 @@ dEQP-GLES2.functional.uniform_api.info_query.nested_structs_arrays.mat4_mat2_bot dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.get_uniform.nested_structs_arrays.mat4_mat2_both,Fail dEQP-GLES2.functional.uniform_api.value.assigned.by_pointer.render.nested_structs_arrays.mat4_mat2_both,Fail - # Piglit gpu tests shaders@glsl-arb-fragment-coord-conventions,Fail @@ -494,7 +493,6 @@ shaders@glsl-fs-fogscale@vs and fs,Fail shaders@glsl-fs-loop,Fail shaders@glsl-fs-loop-nested,Fail shaders@glsl-fwidth,Fail -shaders@glsl-lod-bias,Fail shaders@glsl-uniform-interstage-limits@subdivide 5,Fail shaders@glsl-uniform-interstage-limits@subdivide 5- statechanges,Fail shaders@glsl-vs-loop,Fail @@ -505,7 +503,6 @@ shaders@ssa@fs-lost-copy-problem,Fail shaders@ssa@fs-swap-problem,Fail shaders@ssa@fs-while-loop-rotate-value,Fail - spec@!opengl 1.0@depth-clear-precision-check,Fail spec@!opengl 1.0@depth-clear-precision-check@depth16,Fail spec@!opengl 1.0@depth-clear-precision-check@depth24,Fail @@ -535,15 +532,12 @@ spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=2,F spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=4,Fail spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=6,Fail spec@!opengl 1.1@getteximage-formats,Fail -spec@!opengl 1.1@getteximage-simple,Fail spec@!opengl 1.1@gl-1.1-drawarrays-vertex-count 100000 varray gl_line_loop,Fail spec@!opengl 1.1@gl-1.1-drawarrays-vertex-count 100000 varray gl_polygon,Fail spec@!opengl 1.1@gl-1.1-drawarrays-vertex-count 100000 varray gl_triangle_fan,Fail spec@!opengl 1.1@gl-1.1-drawarrays-vertex-count 100000 vbo gl_line_loop,Fail spec@!opengl 1.1@gl-1.1-drawarrays-vertex-count 100000 vbo gl_polygon,Fail spec@!opengl 1.1@gl-1.1-drawarrays-vertex-count 100000 vbo gl_triangle_fan,Fail -spec@!opengl 1.1@gl-1.1-read-pixels-after-display-list,Fail -spec@!opengl 1.1@gl-1.2-texture-base-level,Fail spec@!opengl 1.1@line-aa-width,Fail spec@!opengl 1.1@line-smooth-stipple,Fail spec@!opengl 1.1@linestipple,Fail @@ -553,7 +547,6 @@ spec@!opengl 1.1@linestipple@Line loop,Fail spec@!opengl 1.1@linestipple@Line strip,Fail spec@!opengl 1.1@linestipple@Restarting lines within a single Begin-End block,Fail spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@texgen,Fail spec@!opengl 1.1@texwrap formats bordercolor,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB12- swizzled- border color only,Fail @@ -567,20 +560,15 @@ spec@!opengl 1.1@texwrap formats bordercolor@GL_RGBA16- border color only,Fail spec@!opengl 1.2@lodclamp-between,Fail spec@!opengl 1.2@lodclamp-between-max,Fail -spec@!opengl 1.2@tex3d,Fail spec@!opengl 1.2@texwrap 3d,Fail spec@!opengl 1.2@texwrap 3d@GL_RGBA8- NPOT,Fail spec@!opengl 1.2@texwrap 3d proj,Fail spec@!opengl 1.2@texwrap 3d proj@GL_RGBA8- NPOT- projected,Fail spec@!opengl 1.4@gl-1.4-polygon-offset,Fail -spec@!opengl 1.4@tex-miplevel-selection,Fail -spec@!opengl 1.4@tex-miplevel-selection-lod,Fail spec@!opengl 1.4@triangle-rasterization,Fail spec@!opengl 1.4@triangle-rasterization-fbo,Fail - -spec@!opengl 2.0@depth-tex-modes-glsl,Fail spec@!opengl 2.0@gl-2.0-edgeflag,Fail spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail spec@!opengl 2.0@gl-2.0-two-sided-stencil,Fail @@ -588,7 +576,6 @@ spec@!opengl 2.0@occlusion-query-discard,Fail spec@!opengl 2.0@tex3d-npot,Fail spec@!opengl 2.1@pbo,Fail -spec@!opengl 2.1@pbo@test_draw_pixels,Fail spec@!opengl 2.1@pbo@test_polygon_stip,Fail spec@!opengl 2.1@polygon-stipple-fs,Fail @@ -601,11 +588,8 @@ spec@arb_color_buffer_float@gl_rgba32f-render-sanity-fog,Fail spec@arb_color_buffer_float@gl_rgba8_snorm-render-sanity,Fail spec@arb_color_buffer_float@gl_rgba8_snorm-render-sanity-fog,Fail -spec@arb_draw_buffers@fbo-mrt-alphatest,Fail - spec@arb_fragment_coord_conventions@fp-arb-fragment-coord-conventions-integer,Fail -spec@arb_fragment_program@fp-formats,Fail spec@arb_fragment_program@fp-indirections2,Fail spec@arb_framebuffer_object@fbo-attachments-blit-scaled-linear,Fail @@ -714,10 +698,6 @@ spec@egl 1.4@eglterminate then unbind context,Fail spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_rgba,Fail spec@egl_khr_surfaceless_context@viewport,Fail -spec@ext_direct_state_access@multi-texture,Fail -spec@ext_direct_state_access@multi-texture@CopyMultiTexImage1DEXT + display list GL_COMPILE,Fail -spec@ext_direct_state_access@multi-texture@CopyMultiTexSubImage1DEXT + display list GL_COMPILE,Fail -spec@ext_direct_state_access@textures,Fail spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail @@ -761,8 +741,6 @@ spec@ext_occlusion_query_boolean@any-samples,Fail spec@ext_packed_depth_stencil@depth_stencil texture,Fail -spec@ext_texture_compression_s3tc@s3tc-errors,Fail - spec@ext_texture_format_bgra8888@api-errors,Fail spec@ext_texture_snorm@fbo-alphatest-formats,Fail @@ -1087,8 +1065,6 @@ spec@glsl-1.10@execution@vs-loop-variable-iteration-limit-unroll4,Fail spec@glsl-1.10@execution@vs-nested-return-sibling-loop,Fail spec@glsl-1.10@execution@vs-nested-return-sibling-loop2,Fail - - spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-vertex,Fail spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-vertex,Fail spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-vertex,Fail @@ -1127,18 +1103,9 @@ spec@glsl-1.20@execution@vs-loop-uint-induction-var-2,Fail spec@glsl-1.20@execution@vs-loop-uint-induction-var-3,Fail spec@glsl-1.20@execution@vs-loop-uint-induction-var-4,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() 1d,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() cube,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) 1d,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) cube,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 1dshadow,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 1d_projvec4,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d_projvec4,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 1d,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 1d_projvec4,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 2d,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 2d_projvec4,Fail spec@glsl-1.20@execution@built-in-functions@fs-matrixcompmult-mat2x3-mat2x3,Fail spec@glsl-1.20@execution@built-in-functions@fs-matrixcompmult-mat2x4-mat2x4,Fail @@ -1267,16 +1234,9 @@ spec@nv_conditional_render@dlist,Fail spec@nv_conditional_render@drawpixels,Fail spec@nv_conditional_render@vertex_array,Fail -spec@nv_texture_env_combine4@nv_texture_env_combine4-combine,Fail - -spec@oes_texture_float@oes_texture_float half,Fail - # uprev Piglit in Mesa -spec@!opengl 1.1@teximage-scale-bias,Fail spec@glsl-1.10@execution@glsl-fs-texture2d-mipmap-const-bias-01,Fail spec@glsl-1.10@execution@glsl-fs-texture2d-mipmap-const-bias-04,Fail spec@glsl-1.10@execution@glsl-fs-texture2d-mipmap-const-bias-05,Fail shaders@glsl-max-varyings,Fail spec@!opengl 1.2@tex3d-maxsize,Fail -spec@!opengl 1.5@depth-tex-compare,Fail - diff --git a/src/gallium/drivers/r300/ci/r300-rv410-flakes.txt b/src/gallium/drivers/r300/ci/r300-rv410-flakes.txt index 73bcc9aa5eb..2105864112e 100644 --- a/src/gallium/drivers/r300/ci/r300-rv410-flakes.txt +++ b/src/gallium/drivers/r300/ci/r300-rv410-flakes.txt @@ -1,80 +1,7 @@ -# Unfortunately it looks like all tex-miplevel selection -# tests are very flaky. -spec@arb_texture_rectangle@tex-miplevel-selection* -spec@glsl-1.20@execution@tex-miplevel-selection* -spec@!opengl 1.4@tex-miplevel-selection -spec@!opengl 1.4@tex-miplevel-selection-lod -spec@!opengl 1.4@tex-miplevel-selection-lod-bias - -spec@!opengl 1.5@depth-tex-compare -spec@!opengl 2.1@pbo@test_draw_pixels -spec@arb_draw_buffers@fbo-mrt-alphatest -spec@arb_sampler_objects@sampler-incomplete -spec@glsl-1.10@execution@built-in-functions@fs-op-selection-bool-bvec3-bvec3 -spec@glsl-1.20@execution@built-in-functions@vs-op-sub-mat2x3-mat2x3 -spec@oes_draw_elements_base_vertex@oes_draw_elements_base_vertex-drawelements -shaders@glsl-fs-bug25902 -shaders@glsl-lod-bias -spec@oes_texture_float@oes_texture_float -spec@ext_direct_state_access@textures* - -spec@!opengl 1.1@texgen -spec@ati_fragment_shader@ati_fragment_shader-render-textargets - -spec@ati_fragment_shader@ati_fragment_shader-render-notexture -spec@ext_texture_compression_s3tc@s3tc-errors_gles2 - # Uninitialized reads in FS, https://gitlab.freedesktop.org/mesa/mesa/-/issues/12047 spec@glsl-1.10@execution@fs-frontfacing-ternary-neg-1.0-1.0 spec@glsl-1.10@execution@fs-frontfacing-ternary-vec4-neg-1.0-1.0 spec@glsl-1.20@execution@glsl-fs-frontfacing-not -spec@nv_texture_env_combine4@nv_texture_env_combine4-combine - -# uprev Piglit in Mesa -spec@glsl-1.10@execution@built-in-functions@fs-op-div-mat2-mat2 - shaders@glsl-max-varyings >max_varying_components - -shaders@glsl-fs-bug25902 -spec@!opengl 1.0@gl-1.0-blend-func -spec@!opengl 1.4@tex-miplevel-selection-lod-bias -spec@arb_sampler_objects@sampler-incomplete -spec@arb_texture_rectangle@tex-miplevel-selection gl2:textureproj 2drect -spec@arb_texture_rectangle@tex-miplevel-selection gl2:textureproj 2drect_projvec4 -spec@arb_texture_rectangle@tex-miplevel-selection gl2:textureproj 2drectshadow -spec@ati_fragment_shader@ati_fragment_shader-render-notexture -spec@ati_fragment_shader@ati_fragment_shader-render-textargets -spec@ext_direct_state_access@textures@CopyTextureImage1DEXT \+ display list GL_COMPILE -spec@ext_direct_state_access@textures@CopyTextureImage2DEXT \+ display list GL_COMPILE -spec@ext_direct_state_access@textures@CopyTextureSubImage1DEXT \+ display list GL_COMPILE -spec@ext_direct_state_access@textures@CopyTextureSubImage2DEXT \+ display list GL_COMPILE -spec@ext_texture_compression_s3tc@s3tc-errors_gles2 -spec@glsl-1.10@execution@fs-frontfacing-ternary-vec4-neg-1.0-1.0 -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(\) 1dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(\) 2d -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(\) 2dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(bias\) 1dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(bias\) 2d -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(bias\) 2dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 1d -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj\(bias\) 1dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj\(bias\) 2dshadow -spec@khr_texture_compression_astc@miptree-gl srgb-sd -spec@khr_texture_compression_astc@miptree-gl srgb-sd@sRGB skip decode -spec@oes_point_sprite@arb_point_sprite-checkerboard_gles1 -spec@oes_texture_float@oes_texture_float - -spec@!opengl 1.1@draw-pixel-with-texture -spec@!opengl 1.1@getteximage-simple -spec@!opengl 1.1@gl-1.1-read-pixels-after-display-list -spec@!opengl 1.1@gl-1.2-texture-base-level -spec@!opengl 1.1@teximage-scale-bias -spec@ati_fragment_shader@ati_fragment_shader-render-sources -spec@arb_fragment_program@fp-formats -spec@arb_texture_compression@texwrap formats -spec@arb_texture_compression@texwrap formats@GL_COMPRESSED_RGB -spec@arb_texture_compression@texwrap formats@GL_COMPRESSED_RGB- swizzled -spec@glsl-1.10@execution@built-in-functions@fs-op-assign-sub-ivec2-int -spec@glsl-1.20@execution@built-in-functions@vs-op-selection-bool-mat3x2-mat3x2 +shaders@glsl-max-varyings diff --git a/src/gallium/drivers/r300/ci/r300-rv530-nohiz-fails.txt b/src/gallium/drivers/r300/ci/r300-rv530-nohiz-fails.txt index e3997093ceb..9b0096ff9a5 100644 --- a/src/gallium/drivers/r300/ci/r300-rv530-nohiz-fails.txt +++ b/src/gallium/drivers/r300/ci/r300-rv530-nohiz-fails.txt @@ -344,11 +344,9 @@ KHR-GLES2.texture_3d.filtering.sizes.63x63x63_nearest,Fail KHR-GLES2.texture_3d.filtering.sizes.63x63x63_nearest_mipmap_linear,Fail KHR-GLES2.texture_3d.filtering.sizes.63x63x63_nearest_mipmap_nearest,Fail - # Piglit gpu tests shaders@glsl-arb-fragment-coord-conventions,Fail -shaders@glsl-fwidth,Fail shaders@glsl-uniform-interstage-limits@subdivide 5,Fail shaders@glsl-uniform-interstage-limits@subdivide 5- statechanges,Fail @@ -383,11 +381,7 @@ spec@!opengl 1.1@depthstencil-default_fb-readpixels-24_8 samples=6,Fail spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=2,Fail spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=4,Fail spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=6,Fail -spec@!opengl 1.1@draw-pixel-with-texture,Fail spec@!opengl 1.1@getteximage-formats,Fail -spec@!opengl 1.1@getteximage-simple,Fail -spec@!opengl 1.1@gl-1.1-read-pixels-after-display-list,Fail -spec@!opengl 1.1@gl-1.2-texture-base-level,Fail spec@!opengl 1.1@line-aa-width,Fail spec@!opengl 1.1@line-smooth-stipple,Fail spec@!opengl 1.1@linestipple,Fail @@ -406,12 +400,9 @@ spec@!opengl 1.2@texwrap 3d proj,Fail spec@!opengl 1.2@texwrap 3d proj@GL_RGBA8- NPOT- projected,Fail spec@!opengl 1.4@gl-1.4-polygon-offset,Fail -spec@!opengl 1.4@tex-miplevel-selection,Fail -spec@!opengl 1.4@tex-miplevel-selection-lod,Fail spec@!opengl 1.4@triangle-rasterization,Fail spec@!opengl 1.4@triangle-rasterization-fbo,Fail -spec@!opengl 2.0@depth-tex-modes-glsl,Fail spec@!opengl 2.0@gl-2.0-edgeflag,Fail spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail spec@!opengl 2.0@occlusion-query-discard,Fail @@ -431,8 +422,6 @@ spec@arb_color_buffer_float@gl_rgba8_snorm-render-sanity,Fail spec@arb_color_buffer_float@gl_rgba8_snorm-render-sanity-fog,Fail spec@arb_color_buffer_float@mixed-mrt,Fail -spec@arb_draw_buffers@fbo-mrt-alphatest,Fail - spec@arb_fragment_coord_conventions@fp-arb-fragment-coord-conventions-integer,Fail spec@arb_framebuffer_object@fbo-attachments-blit-scaled-linear,Fail @@ -457,21 +446,10 @@ spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgrad,Fail spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 1d,Fail spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 1dshadow,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2d,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2drect,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2dshadow,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 3d,Fail spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb cube,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod 1d,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod 2dshadow,Fail spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 1d,Fail spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 1d_projvec4,Fail spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 1dshadow,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2drectshadow,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 3d,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 1d,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 1d_projvec4,Fail -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 2d,Fail spec@arb_texture_compression_bptc@texwrap formats bordercolor,Fail spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled,Fail @@ -527,8 +505,6 @@ spec@arb_texture_rectangle@1-1-linear-texture,Fail spec@arb_texture_rectangle@copyteximage rect samples=2,Fail spec@arb_texture_rectangle@copyteximage rect samples=4,Fail spec@arb_texture_rectangle@copyteximage rect samples=6,Fail -spec@arb_texture_rectangle@tex-miplevel-selection gl2:textureproj 2drect_projvec4,Fail -spec@arb_texture_rectangle@tex-miplevel-selection gl2:textureproj 2drectshadow,Fail spec@arb_texture_rg@fbo-alphatest-formats,Fail spec@arb_texture_rg@fbo-alphatest-formats@GL_R16,Fail @@ -551,17 +527,11 @@ spec@arb_texture_rg@texwrap formats-float bordercolor@GL_RG32F- border color onl spec@arb_vertex_program@big-param,Fail -spec@ati_fragment_shader@ati_fragment_shader-render-sources,Fail - spec@egl 1.4@eglterminate then unbind context,Fail spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_rgba,Fail spec@egl_khr_surfaceless_context@viewport,Fail -spec@ext_direct_state_access@multi-texture,Fail -spec@ext_direct_state_access@multi-texture@CopyMultiTexImage1DEXT + display list GL_COMPILE,Fail -spec@ext_direct_state_access@multi-texture@CopyMultiTexSubImage1DEXT + display list GL_COMPILE,Fail -spec@ext_direct_state_access@textures,Fail spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail @@ -588,8 +558,6 @@ spec@ext_packed_depth_stencil@depth_stencil texture,Fail spec@ext_texture_compression_rgtc@rgtc-teximage-01,Fail spec@ext_texture_compression_rgtc@rgtc-teximage-02,Fail -spec@ext_texture_compression_s3tc@s3tc-errors,Fail - spec@ext_texture_format_bgra8888@api-errors,Fail spec@ext_texture_snorm@fbo-alphatest-formats,Fail @@ -719,18 +687,8 @@ spec@glsl-1.20@execution@vs-loop-uint-induction-var-2,Fail spec@glsl-1.20@execution@vs-loop-uint-induction-var-3,Fail spec@glsl-1.20@execution@vs-loop-uint-induction-var-4,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() 2d,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() cube,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) 1d,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) 2d,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) cube,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 1dshadow,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d_projvec4,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 1d,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 1d_projvec4,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 2d,Fail -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 2d_projvec4,Fail spec@intel_performance_query@intel_performance_query-issue_2235,Fail @@ -747,12 +705,6 @@ spec@nv_conditional_render@dlist,Fail spec@nv_conditional_render@drawpixels,Fail spec@nv_conditional_render@vertex_array,Fail -spec@nv_texture_env_combine4@nv_texture_env_combine4-combine,Fail - -spec@oes_texture_float@oes_texture_float,Fail -spec@oes_texture_float@oes_texture_float half,Fail - - # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10557 dEQP-GLES2.functional.texture.mipmap.2d.projected.nearest_nearest_mirror,Fail dEQP-GLES2.functional.texture.mipmap.2d.projected.nearest_nearest_repeat,Fail @@ -762,7 +714,6 @@ dEQP-GLES2.functional.texture.mipmap.2d.projected.linear_nearest_mirror,Fail dEQP-GLES2.functional.texture.mipmap.2d.projected.linear_nearest_clamp,Fail # uprev Piglit in Mesa -spec@!opengl 1.1@teximage-scale-bias,Fail spec@ext_framebuffer_multisample@accuracy all_samples color depthstencil linear,Fail spec@ext_framebuffer_multisample@accuracy all_samples color depthstencil,Fail spec@ext_framebuffer_multisample@accuracy all_samples color small depthstencil linear,Fail diff --git a/src/gallium/drivers/r300/ci/r300-rv530-nohiz-flakes.txt b/src/gallium/drivers/r300/ci/r300-rv530-nohiz-flakes.txt index 80b3f9b9c50..e69de29bb2d 100644 --- a/src/gallium/drivers/r300/ci/r300-rv530-nohiz-flakes.txt +++ b/src/gallium/drivers/r300/ci/r300-rv530-nohiz-flakes.txt @@ -1,99 +0,0 @@ -# Unfortunately it looks like all tex-miplevel selection -# tests are very flaky. -spec@arb_shader_texture_lod@execution@tex-miplevel-selection* -spec@arb_texture_rectangle@tex-miplevel-selection* -spec@glsl-1.20@execution@tex-miplevel-selection* -spec@!opengl 1.4@tex-miplevel-selection -spec@!opengl 1.4@tex-miplevel-selection-lod -spec@!opengl 1.4@tex-miplevel-selection-lod-bias - -shaders@glsl-derivs -spec@!opengl 2.1@pbo@test_draw_pixels -spec@arb_draw_buffers@fbo-mrt-alphatest -spec@arb_sampler_objects@sampler-incomplete -spec@glsl-1.10@execution@built-in-functions@fs-op-selection-bool-bvec3-bvec3 -spec@oes_draw_elements_base_vertex@oes_draw_elements_base_vertex-drawelements -shaders@glsl-fs-bug25902 -shaders@glsl-lod-bias -spec@!opengl 1.2@mipmap-setup -spec@!opengl 1.5@depth-tex-compare - -# Updated by ci-collate, found in this job run: https://gitlab.freedesktop.org/mesa/mesa/-/jobs/56164946 -spec@!opengl 1.1@texgen -spec@!opengl 1.2@tex3d -spec@ati_fragment_shader@ati_fragment_shader-render-textargets - -# Nightly run expectations update -spec@ati_fragment_shader@ati_fragment_shader-render-notexture -spec@ext_texture_compression_s3tc@s3tc-errors_gles2 - -# could be related to https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/899 -spec@!opengl 1.0@depth-clear-precision-check@depth16 - -# Pass when interactive, usually fail in CI but can randomly pass as well. -spec@oes_texture_float@oes_texture_float* - -spec@!opengl 1.1@gl-1.1-read-pixels-after-display-list - -spec@glsl-1.10@execution@built-in-functions@fs-op-ge-int-int-using-if -spec@glsl-1.10@execution@built-in-functions@vs-op-assign-div-mat2-float - -# uprev Piglit in Mesa -spec@!opengl 1.1@tex-upside-down-miptree -spec@!opengl 1.2@mipmap-setup -spec@!opengl 1.5@depth-tex-compare - -spec@!opengl 1.0@gl-1.0-blend-func -spec@!opengl 1.1@gl-1.1-drawarrays-vertex-count 100000 vbo gl_triangles -spec@!opengl 1.1@tex-upside-down-miptree -spec@!opengl 2.1@pbo@test_draw_pixels -spec@arb_fragment_program@fp-formats -spec@arb_fragment_program@fp-indirections2 -spec@arb_sampler_objects@sampler-incomplete -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod 1dshadow -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod 2d -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2d -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2drect_projvec4 -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2dshadow -spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 1dshadow -spec@arb_texture_rectangle@tex-miplevel-selection gl2:texture\(\) 2drectshadow -spec@arb_texture_rectangle@tex-miplevel-selection gl2:textureproj 2drect -spec@arb_vertex_buffer_object@vbo-subdata-many drawelements -spec@ext_direct_state_access@textures@CopyTextureImage2DEXT \+ display list GL_COMPILE -spec@ext_direct_state_access@textures@CopyTextureSubImage2DEXT \+ display list GL_COMPILE -spec@ext_texture_compression_rgtc@compressedteximage gl_compressed_red_rgtc1_ext -spec@ext_texture_compression_s3tc@s3tc-errors_gles2 -spec@glsl-1.10@execution@built-in-functions@fs-op-selection-bool-ivec2-ivec2 -spec@glsl-1.10@execution@built-in-functions@vs-distance-vec3-vec3 -spec@glsl-1.20@execution@built-in-functions@vs-op-div-mat4x3-mat4x3 -spec@glsl-1.20@execution@built-in-functions@vs-op-selection-bool-mat3x2-mat3x2 -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(\) 1d -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(\) 2dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(bias\) 1dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture\(bias\) 2dshadow -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 1d -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 1d_projvec4 -spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj\(bias\) 1dshadow -spec@khr_texture_compression_astc@miptree-gl srgb-sd -spec@khr_texture_compression_astc@miptree-gl srgb-sd@sRGB skip decode - -spec@ext_direct_state_access@textures -spec@oes_point_sprite@arb_point_sprite-checkerboard_gles1 -spec@!opengl 1.1@getteximage-simple -spec@!opengl 1.1@texsubimage-unpack -spec@arb_texture_float@fbo-alphatest-formats@GL_RGBA16F -shaders@glsl-fwidth -spec@glsl-1.20@execution@built-in-functions@vs-op-div-float-mat2x4 -spec@glsl-1.20@execution@built-in-functions@vs-transpose-mat3x4 -spec@nv_texture_env_combine4@nv_texture_env_combine4-combine -spec@ext_texture_env_combine@texture-env-combine -spec@glsl-1.10@execution@built-in-functions@fs-op-ne-vec2-vec2-using-if -spec@oes_point_sprite@arb_point_sprite-checkerboard_gles1 -spec@glsl-1.10@execution@built-in-functions@vs-max-vec4-vec4 -spec@!opengl 1.1@draw-pixel-with-texture -spec@glsl-1.10@execution@built-in-functions@fs-op-eq-bvec2-bvec2-using-if -spec@oes_point_sprite@arb_point_sprite-checkerboard_gles1 -spec@ext_direct_state_access@textures@CopyTextureImage1DEXT \+ display list GL_COMPILE -spec@ext_direct_state_access@textures@CopyTextureImage2DEXT \+ display list GL_COMPILE -spec@ext_direct_state_access@textures@CopyTextureSubImage1DEXT \+ display list GL_COMPILE -spec@ext_direct_state_access@textures@CopyTextureSubImage2DEXT \+ display list GL_COMPILE diff --git a/src/gallium/drivers/r300/r300_texture_desc.c b/src/gallium/drivers/r300/r300_texture_desc.c index cbfdac83bfa..773490a517c 100644 --- a/src/gallium/drivers/r300/r300_texture_desc.c +++ b/src/gallium/drivers/r300/r300_texture_desc.c @@ -138,6 +138,12 @@ static unsigned r300_texture_get_stride(struct r300_screen *screen, tex->b.bind & PIPE_BIND_SCANOUT); width = align(width, tile_width); + /* NPOT textures use stride addressing (TX_PITCH_EN). Keep macro-tiled + * strides at an even number of macro tiles in X to prevent flakes. */ + if (tex->tex.macrotile[level] && tex->tex.uses_stride_addressing) { + width = align(width, tile_width * 2); + } + stride = util_format_get_stride(tex->b.format, width); /* The alignment to 32 bytes is sort of implied by the layout... */ return stride;