diff options
| author | Eric Anholt <eric@anholt.net> | 2021-02-19 15:22:08 -0800 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-02-23 20:38:50 +0000 |
| commit | 5e0e04f288a7f53cf3dc49f2c3deff6185b35749 (patch) | |
| tree | 117e07fca08d41a76aca2f7b8e0e36a766134a71 | |
| parent | a46b73ee2506d8d6172634af3de1522d0c3bc368 (diff) | |
llvmpipe: Enable FXT1 texture decompression.
We have the software decode hooked up now, and it's not like this
decompression is more expensive than a lot of other software decompression
we have. One less feature to be missing from the old swrast classic driver.
Reviewed-by: Adam jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9194>
| -rw-r--r-- | src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt | 11 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_screen.c | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt index ad27e2d3888..7c287e19420 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt @@ -396,10 +396,6 @@ spec/!opengl 3.2/gl-3.2-adj-prims line cull-front pv-first: fail spec/!opengl 3.2/gl-3.2-adj-prims pv-first: fail spec/!opengl 3.2/layered-rendering/clear-color-mismatched-layer-count: fail spec/!opengl es 2.0/invalid-es3-queries_gles2: skip -spec/3dfx_texture_compression_fxt1/compressedteximage gl_compressed_rgb_fxt1_3dfx: skip -spec/3dfx_texture_compression_fxt1/compressedteximage gl_compressed_rgba_fxt1_3dfx: skip -spec/3dfx_texture_compression_fxt1/fbo-generatemipmap-formats: skip -spec/3dfx_texture_compression_fxt1/fxt1-teximage: skip spec/amd_compressed_atc_texture/miptree: skip spec/amd_depth_clamp_separate/amd_depth_clamp_separate_range: skip spec/amd_depth_clamp_separate/amd_depth_clamp_separate_status: skip @@ -468,7 +464,6 @@ spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 d=z32f_s8_s=z24_s8 spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 d=z32f_s=z24_s8: skip spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 s=z24_s8_d=z32f: skip spec/arb_depth_buffer_float/depthstencil-render-miplevels 585 s=z24_s8_d=z32f_s8: skip -spec/arb_direct_state_access/getcompressedtextureimage: skip spec/arb_direct_state_access/gettextureimage-formats: crash spec/arb_fragment_program/fp-indirections: skip spec/arb_fragment_shader_interlock/arb_fragment_shader_interlock-image-load-store: skip @@ -1654,10 +1649,10 @@ wgl/wgl-sanity: skip summary: name: results ---- -------- - pass: 23142 + pass: 23158 fail: 189 crash: 1 - skip: 1439 + skip: 1434 timeout: 0 warn: 6 incomplete: 0 @@ -1666,4 +1661,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 24795 + total: 24806 diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 19f08400604..7a16425bf0b 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -703,8 +703,7 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen, } if (format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC || - format_desc->layout == UTIL_FORMAT_LAYOUT_ATC || - format_desc->layout == UTIL_FORMAT_LAYOUT_FXT1) { + format_desc->layout == UTIL_FORMAT_LAYOUT_ATC) { /* Software decoding is not hooked up. */ return false; } |