diff options
author | Dave Airlie <airlied@redhat.com> | 2020-09-08 05:37:36 +1000 |
---|---|---|
committer | Eric Engestrom <eric@engestrom.ch> | 2020-09-16 19:23:27 +0200 |
commit | 1cd618104a7f47f642e94ce5f6beaa72111b2ed4 (patch) | |
tree | 777d2ad80530627a4193c5fff53eadd008e75f08 | |
parent | b5531f571b50f448f48690a087c35639f8ec395b (diff) |
gallivm: disable brilinear for lod bias and explicit lod.
This allows GL 4.5 CTS to pass in full with no flags, other than
that I'm not sure if it's a good or bad idea.
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Cc: mesa-stable@lists.freedesktop.org
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6638>
(cherry picked from commit b0722cb670156ef7d8d1ada4afaf8bf5cd5b9dba)
-rw-r--r-- | .gitlab-ci/deqp-llvmpipe-fails.txt | 42 | ||||
-rw-r--r-- | .gitlab-ci/piglit/quick_shader.txt | 8 | ||||
-rw-r--r-- | .pick_status.json | 2 | ||||
-rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c | 2 |
4 files changed, 4 insertions, 50 deletions
diff --git a/.gitlab-ci/deqp-llvmpipe-fails.txt b/.gitlab-ci/deqp-llvmpipe-fails.txt index 795cc4bab44..008de30eee3 100644 --- a/.gitlab-ci/deqp-llvmpipe-fails.txt +++ b/.gitlab-ci/deqp-llvmpipe-fails.txt @@ -79,45 +79,3 @@ dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_linear dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_nearest dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_linear dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_nearest -dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_linear_clamp -dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_linear_mirror -dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_linear_repeat -dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_nearest_clamp -dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_nearest_mirror -dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_nearest_repeat -dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_linear_clamp -dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_linear_mirror -dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_linear_repeat -dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_nearest_clamp -dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_nearest_mirror -dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_nearest_repeat -dEQP-GLES2.functional.texture.vertex.2d.wrap.clamp_clamp -dEQP-GLES2.functional.texture.vertex.2d.wrap.clamp_mirror -dEQP-GLES2.functional.texture.vertex.2d.wrap.clamp_repeat -dEQP-GLES2.functional.texture.vertex.2d.wrap.mirror_clamp -dEQP-GLES2.functional.texture.vertex.2d.wrap.mirror_mirror -dEQP-GLES2.functional.texture.vertex.2d.wrap.mirror_repeat -dEQP-GLES2.functional.texture.vertex.2d.wrap.repeat_clamp -dEQP-GLES2.functional.texture.vertex.2d.wrap.repeat_mirror -dEQP-GLES2.functional.texture.vertex.2d.wrap.repeat_repeat -dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_clamp -dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_mirror -dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_repeat -dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_clamp -dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_mirror -dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_repeat -dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_clamp -dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_mirror -dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_repeat -dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_nearest_clamp -dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_nearest_mirror -dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_nearest_repeat -dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_clamp -dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_mirror -dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_repeat -dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_clamp -dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_mirror -dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_repeat -dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_clamp -dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_mirror -dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_repeat diff --git a/.gitlab-ci/piglit/quick_shader.txt b/.gitlab-ci/piglit/quick_shader.txt index a83073ceab5..61b3504783a 100644 --- a/.gitlab-ci/piglit/quick_shader.txt +++ b/.gitlab-ci/piglit/quick_shader.txt @@ -1693,10 +1693,6 @@ spec/glsl-1.10/execution/built-in-functions/vs-pow-float-float: fail spec/glsl-1.10/preprocessor/extension-defined-test: skip spec/glsl-1.10/preprocessor/extension-if-1: skip spec/glsl-1.30/execution/fs-texturegrad-miplevels: fail -spec/glsl-1.30/execution/fs-texturelod-miplevels: fail -spec/glsl-1.30/execution/fs-texturelod-miplevels-biased: fail -spec/glsl-1.30/execution/vs-texturelod-miplevels: fail -spec/glsl-1.30/execution/vs-texturelod-miplevels-biased: fail spec/glsl-1.50/execution/built-in-functions/gs-pow-float-float: fail spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-accept: skip spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-reject: skip @@ -4635,8 +4631,8 @@ spec/oes_viewport_array/viewport-gs-writes-out-of-range: skip summary: name: results ---- -------- - pass: 10712 - fail: 57 + pass: 10716 + fail: 53 crash: 0 skip: 4577 timeout: 0 diff --git a/.pick_status.json b/.pick_status.json index e3cf16b390d..739c990f3c0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1084,7 +1084,7 @@ "description": "gallivm: disable brilinear for lod bias and explicit lod.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c index 7cc60f25856..def727e6852 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c @@ -2865,7 +2865,7 @@ lp_build_sample_soa_code(struct gallivm_state *gallivm, if (gallivm_perf & GALLIVM_PERF_NO_RHO_APPROX || op_is_lodq) { bld.no_rho_approx = TRUE; } - if (gallivm_perf & GALLIVM_PERF_NO_BRILINEAR || op_is_lodq) { + if (gallivm_perf & GALLIVM_PERF_NO_BRILINEAR || op_is_lodq || lod_bias || explicit_lod) { bld.no_brilinear = TRUE; } |