Mesa (main): i915g: Fix up the format mapping for DXT1_*RGB

[GitLab Mirror]

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

Author: Emma Anholt <emma at anholt.net>
Date:   Fri Aug 13 17:07:24 2021 -0700

i915g: Fix up the format mapping for DXT1_*RGB

We weren't wiring alpha to 1 like we should.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12367>

---

 src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt | 1 -
 src/gallium/drivers/i915/i915_state_sampler.c         | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
index ad1bc689d6c..8f20b151266 100644
--- a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
+++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
@@ -426,7 +426,6 @@ spec at ext_packed_depth_stencil@fbo-depthstencil-gl_depth24_stencil8-clear,Fail
 spec at ext_packed_depth_stencil@fbo-stencil-gl_depth24_stencil8-blit,Fail
 spec at ext_packed_depth_stencil@texwrap formats bordercolor,Fail
 spec at ext_packed_depth_stencil@texwrap formats bordercolor at GL_DEPTH24_STENCIL8- border color only,Fail
-spec at ext_texture_compression_s3tc@s3tc-targeted,Fail
 spec at ext_texture_compression_s3tc@texwrap formats bordercolor,Fail
 spec at ext_texture_compression_s3tc@texwrap formats bordercolor at GL_COMPRESSED_RGBA_S3TC_DXT1_EXT- border color only,Fail
 spec at ext_texture_compression_s3tc@texwrap formats bordercolor at GL_COMPRESSED_RGBA_S3TC_DXT3_EXT- border color only,Fail
diff --git a/src/gallium/drivers/i915/i915_state_sampler.c b/src/gallium/drivers/i915/i915_state_sampler.c
index bcfffcee143..72070d7059a 100644
--- a/src/gallium/drivers/i915/i915_state_sampler.c
+++ b/src/gallium/drivers/i915/i915_state_sampler.c
@@ -219,10 +219,11 @@ translate_texture_format(enum pipe_format pipeFormat,
 #endif
    case PIPE_FORMAT_Z16_UNORM:
       return (MAPSURF_16BIT | MT_16BIT_L16);
-   case PIPE_FORMAT_DXT1_RGBA:
-   case PIPE_FORMAT_DXT1_SRGBA:
    case PIPE_FORMAT_DXT1_RGB:
    case PIPE_FORMAT_DXT1_SRGB:
+      return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT1_RGB);
+   case PIPE_FORMAT_DXT1_RGBA:
+   case PIPE_FORMAT_DXT1_SRGBA:
       return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT1);
    case PIPE_FORMAT_DXT3_RGBA:
    case PIPE_FORMAT_DXT3_SRGBA: