From 052a8a9426049c37af211d8f7a70a3fb5c6f59e9 Mon Sep 17 00:00:00 2001 From: Patrick Lerda Date: Fri, 11 Apr 2025 13:11:54 +0200 Subject: [PATCH] r600: fix rv770 border color The border color of the rv770 gpu behaves the same way as the evergreen border color. This change updates the software accordingly. This change is enabled for all the pre-evergreen gpus. This change fixes 120 piglit tests. The rv770 ci is updated as well. Cc: mesa-stable Signed-off-by: Patrick Lerda Part-of: (cherry picked from commit 5bee7c0b122ed307430c12e3963830e30ead0248) --- .pick_status.json | 2 +- .../drivers/r600/ci/r600-rv770-fails.txt | 137 ------------------ src/gallium/drivers/r600/evergreen_state.c | 6 +- src/gallium/drivers/r600/r600_pipe.h | 4 + src/gallium/drivers/r600/r600_state.c | 8 +- 5 files changed, 15 insertions(+), 142 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 92c55193e5c..009ec6eb32f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1644,7 +1644,7 @@ "description": "r600: fix rv770 border color", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/r600/ci/r600-rv770-fails.txt b/src/gallium/drivers/r600/ci/r600-rv770-fails.txt index 849770042bb..e340370bb49 100644 --- a/src/gallium/drivers/r600/ci/r600-rv770-fails.txt +++ b/src/gallium/drivers/r600/ci/r600-rv770-fails.txt @@ -560,16 +560,8 @@ spec@ext_texture_srgb_r8@teximage-colors gl_sr8_ext@GL_SR8_EXT texture with GL_R spec@ext_texture_srgb_r8@teximage-colors gl_sr8_ext@GL_SR8_EXT texture with GL_RGBA and GL_UNSIGNED_SHORT_5_5_5_1,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled,Fail -spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB10- swizzled- border color only,Fail -spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB10_A2- swizzled- border color only,Fail -spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB12- swizzled- border color only,Fail -spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB16- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB4- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB5- swizzled- border color only,Fail -spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB8- swizzled- border color only,Fail -spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA12- swizzled- border color only,Fail -spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA16- swizzled- border color only,Fail -spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail spec@!opengl 2.1@pbo,Fail spec@!opengl 2.1@pbo@test_polygon_stip,Fail @@ -674,18 +666,9 @@ spec@arb_sampler_objects@framebufferblit,Fail spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb cube,Fail -spec@arb_texture_compression@texwrap formats bordercolor-swizzled,Fail -spec@arb_texture_compression@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGB- swizzled- border color only,Fail -spec@arb_texture_compression@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGBA- swizzled- border color only,Fail - spec@arb_texture_float@fbo-blending-formats,Fail spec@arb_texture_float@fbo-blending-formats@GL_RGB16F,Fail spec@arb_texture_float@fbo-blending-formats@GL_RGB32F,Fail -spec@arb_texture_float@texwrap formats bordercolor-swizzled,Fail -spec@arb_texture_float@texwrap formats bordercolor-swizzled@GL_RGB16F- swizzled- border color only,Fail -spec@arb_texture_float@texwrap formats bordercolor-swizzled@GL_RGB32F- swizzled- border color only,Fail -spec@arb_texture_float@texwrap formats bordercolor-swizzled@GL_RGBA16F- swizzled- border color only,Fail -spec@arb_texture_float@texwrap formats bordercolor-swizzled@GL_RGBA32F- swizzled- border color only,Fail spec@arb_texture_multisample@texelfetch fs sampler2dmsarray 4 98x1x9-98x129x9,Fail spec@arb_texture_multisample@texelfetch@2-gs-sampler2dms,Fail @@ -711,50 +694,16 @@ spec@arb_texture_multisample@texturesize@vs-texturesize-usampler2dmsarray,Fail spec@arb_texture_rg@multisample-fast-clear gl_arb_texture_rg-int,Fail -spec@arb_texture_rg@texwrap formats bordercolor-swizzled,Fail -spec@arb_texture_rg@texwrap formats bordercolor-swizzled@GL_R16- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats bordercolor-swizzled@GL_R8- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats bordercolor-swizzled@GL_RG16- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats bordercolor-swizzled@GL_RG8- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-float bordercolor-swizzled,Fail -spec@arb_texture_rg@texwrap formats-float bordercolor-swizzled@GL_R16F- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-float bordercolor-swizzled@GL_R32F- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-float bordercolor-swizzled@GL_RG16F- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-float bordercolor-swizzled@GL_RG32F- swizzled- border color only,Fail spec@arb_texture_rg@texwrap formats-int bordercolor,Fail spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_R16I- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_R16UI- swizzled- border color only,Fail spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_R32I- swizzled- border color only,Fail spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_R32UI- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_R8I- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_R8UI- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_RG16I- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_RG16UI- swizzled- border color only,Fail spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_RG32I- swizzled- border color only,Fail spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_RG32UI- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_RG8I- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled@GL_RG8UI- swizzled- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor@GL_R16I- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor@GL_R16UI- border color only,Fail spec@arb_texture_rg@texwrap formats-int bordercolor@GL_R32I- border color only,Fail spec@arb_texture_rg@texwrap formats-int bordercolor@GL_R32UI- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor@GL_R8I- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor@GL_R8UI- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor@GL_RG16I- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor@GL_RG16UI- border color only,Fail spec@arb_texture_rg@texwrap formats-int bordercolor@GL_RG32I- border color only,Fail spec@arb_texture_rg@texwrap formats-int bordercolor@GL_RG32UI- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor@GL_RG8I- border color only,Fail -spec@arb_texture_rg@texwrap formats-int bordercolor@GL_RG8UI- border color only,Fail -spec@arb_texture_rgb10_a2ui@texwrap formats bordercolor,Fail -spec@arb_texture_rgb10_a2ui@texwrap formats bordercolor-swizzled,Fail -spec@arb_texture_rgb10_a2ui@texwrap formats bordercolor-swizzled@GL_RGB10_A2UI- swizzled- border color only,Fail -spec@arb_texture_rgb10_a2ui@texwrap formats bordercolor@GL_RGB10_A2UI- border color only,Fail -spec@arb_texture_stencil8@texwrap formats bordercolor,Fail -spec@arb_texture_stencil8@texwrap formats bordercolor-swizzled,Fail -spec@arb_texture_stencil8@texwrap formats bordercolor-swizzled@GL_STENCIL_INDEX8- swizzled- border color only,Fail -spec@arb_texture_stencil8@texwrap formats bordercolor@GL_STENCIL_INDEX8- border color only,Fail spec@arb_texture_storage@texture-storage@cube array texture,Fail @@ -829,128 +778,42 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y216,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv,Fail -spec@ext_packed_float@texwrap formats bordercolor-swizzled,Fail -spec@ext_packed_float@texwrap formats bordercolor-swizzled@GL_R11F_G11F_B10F- swizzled- border color only,Fail - -spec@ext_texture_compression_rgtc@texwrap formats bordercolor-swizzled,Fail -spec@ext_texture_compression_rgtc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RED_RGTC1- swizzled- border color only,Fail -spec@ext_texture_compression_rgtc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RG_RGTC2- swizzled- border color only,Fail -spec@ext_texture_compression_rgtc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_SIGNED_RED_RGTC1- swizzled- border color only,Fail -spec@ext_texture_compression_rgtc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_SIGNED_RG_RGTC2- swizzled- border color only,Fail -spec@ext_texture_compression_s3tc@texwrap formats bordercolor-swizzled,Fail -spec@ext_texture_compression_s3tc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGBA_S3TC_DXT1_EXT- swizzled- border color only,Fail -spec@ext_texture_compression_s3tc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGBA_S3TC_DXT3_EXT- swizzled- border color only,Fail -spec@ext_texture_compression_s3tc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGBA_S3TC_DXT5_EXT- swizzled- border color only,Fail -spec@ext_texture_compression_s3tc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGB_S3TC_DXT1_EXT- swizzled- border color only,Fail - spec@ext_texture_integer@multisample-fast-clear gl_ext_texture_integer,Fail spec@ext_texture_integer@texwrap formats bordercolor,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_ALPHA16I_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_ALPHA16UI_EXT- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_ALPHA32I_EXT- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_ALPHA32UI_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_ALPHA8I_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_ALPHA8UI_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_INTENSITY16I_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_INTENSITY16UI_EXT- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_INTENSITY32I_EXT- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_INTENSITY32UI_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_INTENSITY8I_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_INTENSITY8UI_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE16I_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE16UI_EXT- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE32I_EXT- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE32UI_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE8I_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE8UI_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE_ALPHA16I_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE_ALPHA16UI_EXT- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE_ALPHA32I_EXT- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE_ALPHA32UI_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE_ALPHA8I_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_LUMINANCE_ALPHA8UI_EXT- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGB16I- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGB16UI- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGB32I- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGB32UI- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGB8I- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGB8UI- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGBA16I- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGBA16UI- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGBA32I- swizzled- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGBA32UI- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGBA8I- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor-swizzled@GL_RGBA8UI- swizzled- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_ALPHA16I_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_ALPHA16UI_EXT- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_ALPHA32I_EXT- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_ALPHA32UI_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_ALPHA8I_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_ALPHA8UI_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_INTENSITY16I_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_INTENSITY16UI_EXT- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_INTENSITY32I_EXT- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_INTENSITY32UI_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_INTENSITY8I_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_INTENSITY8UI_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE16I_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE16UI_EXT- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE32I_EXT- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE32UI_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE8I_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE8UI_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE_ALPHA16I_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE_ALPHA16UI_EXT- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE_ALPHA32I_EXT- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE_ALPHA32UI_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE_ALPHA8I_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_LUMINANCE_ALPHA8UI_EXT- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_RGB16I- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_RGB16UI- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_RGB32I- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_RGB32UI- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_RGB8I- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_RGB8UI- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_RGBA16I- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_RGBA16UI- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_RGBA32I- border color only,Fail spec@ext_texture_integer@texwrap formats bordercolor@GL_RGBA32UI- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_RGBA8I- border color only,Fail -spec@ext_texture_integer@texwrap formats bordercolor@GL_RGBA8UI- border color only,Fail - -spec@ext_texture_shared_exponent@texwrap formats bordercolor-swizzled,Fail -spec@ext_texture_shared_exponent@texwrap formats bordercolor-swizzled@GL_RGB9_E5- swizzled- border color only,Fail spec@ext_texture_snorm@fbo-blending-formats,Fail spec@ext_texture_snorm@fbo-blending-formats@GL_RGB16_SNORM,Fail spec@ext_texture_snorm@fbo-blending-formats@GL_RGB8_SNORM,Fail spec@ext_texture_snorm@fbo-blending-formats@GL_RGB_SNORM,Fail -spec@ext_texture_snorm@texwrap formats bordercolor-swizzled,Fail -spec@ext_texture_snorm@texwrap formats bordercolor-swizzled@GL_R16_SNORM- swizzled- border color only,Fail -spec@ext_texture_snorm@texwrap formats bordercolor-swizzled@GL_R8_SNORM- swizzled- border color only,Fail -spec@ext_texture_snorm@texwrap formats bordercolor-swizzled@GL_RG16_SNORM- swizzled- border color only,Fail -spec@ext_texture_snorm@texwrap formats bordercolor-swizzled@GL_RG8_SNORM- swizzled- border color only,Fail -spec@ext_texture_snorm@texwrap formats bordercolor-swizzled@GL_RGB16_SNORM- swizzled- border color only,Fail -spec@ext_texture_snorm@texwrap formats bordercolor-swizzled@GL_RGB8_SNORM- swizzled- border color only,Fail -spec@ext_texture_snorm@texwrap formats bordercolor-swizzled@GL_RGBA16_SNORM- swizzled- border color only,Fail -spec@ext_texture_snorm@texwrap formats bordercolor-swizzled@GL_RGBA8_SNORM- swizzled- border color only,Fail - spec@ext_texture_srgb@fbo-fast-clear,Fail -spec@ext_texture_srgb@texwrap formats bordercolor-swizzled,Fail -spec@ext_texture_srgb@texwrap formats bordercolor-swizzled@GL_SRGB8- swizzled- border color only,Fail -spec@ext_texture_srgb@texwrap formats bordercolor-swizzled@GL_SRGB8_ALPHA8- swizzled- border color only,Fail -spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled,Fail -spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB- swizzled- border color only,Fail -spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA- swizzled- border color only,Fail -spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT- swizzled- border color only,Fail -spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT- swizzled- border color only,Fail -spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT- swizzled- border color only,Fail -spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_S3TC_DXT1_EXT- swizzled- border color only,Fail - spec@ext_transform_feedback@immediate-reuse-index-buffer,Fail spec@glsl-1.20@compiler@invalid-vec4-array-to-vec3-array-conversion.vert,Fail diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 76ad1b73e8a..deb29b6e313 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -2598,9 +2598,9 @@ static void cayman_convert_border_color(union pipe_color_union *in, } } -static void evergreen_convert_border_color(union pipe_color_union *in, - union pipe_color_union *out, - struct pipe_sampler_view *view) +void evergreen_convert_border_color(const union pipe_color_union *in, + union pipe_color_union *out, + const struct pipe_sampler_view *view) { const enum pipe_format format = view->format; const struct util_format_description *d = util_format_description(format); diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 5d57a568f4c..8c5f3422168 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -715,6 +715,10 @@ bool evergreen_adjust_gprs(struct r600_context *rctx); void evergreen_setup_scratch_buffers(struct r600_context *rctx); uint32_t evergreen_construct_rat_mask(struct r600_context *rctx, struct r600_cb_misc_state *a, unsigned nr_cbufs); +void evergreen_convert_border_color(const union pipe_color_union *in, + union pipe_color_union *out, + const struct pipe_sampler_view *view); + /* r600_blit.c */ void r600_init_blit_functions(struct r600_context *rctx); void r600_decompress_depth_textures(struct r600_context *rctx, diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 00ea59b17f1..0781a4f0e13 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -1861,12 +1861,18 @@ static void r600_emit_sampler_states(struct r600_context *rctx, radeon_emit_array(cs, rstate->tex_sampler_words, 3); if (rstate->border_color_use) { + union pipe_color_union border_color = {{0,0,0,1}}; unsigned offset; + /* The rv770 border color is fully compatible with + * evergreen. */ + evergreen_convert_border_color(&rstate->border_color, + &border_color, &rview->base); + offset = border_color_reg; offset += i * 16; radeon_set_config_reg_seq(cs, offset, 4); - radeon_emit_array(cs, rstate->border_color.ui, 4); + radeon_emit_array(cs, border_color.ui, 4); } } texinfo->states.dirty_mask = 0;