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)

4 files changed, 4 insertions, 50 deletions

diff --git a/.gitlab-ci/deqp-llvmpipe-fails.txt b/.gitlab-ci/deqp-llvmpipe-fails.txt
index b2166e7afc0..821538ad901 100644
--- a/.gitlab-ci/deqp-llvmpipe-fails.txt
+++ b/.gitlab-ci/deqp-llvmpipe-fails.txt
@@ -76,45 +76,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 71a8b4f51af..8a6afd4386d 100644
--- a/.gitlab-ci/piglit/quick_shader.txt
+++ b/.gitlab-ci/piglit/quick_shader.txt
@@ -370,10 +370,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
@@ -590,8 +586,8 @@ spec/nv_viewport_swizzle/viewport_swizzle: skip
 summary:
        name:  results
        ----  --------
-       pass:    15786
-       fail:      104
+       pass:    15790
+       fail:      100
       crash:      170
        skip:      315
     timeout:        0
diff --git a/.pick_status.json b/.pick_status.json
index 3887058792e..a691a96195e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -490,7 +490,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 e0d751690ed..e18a1460dd4 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
@@ -2880,7 +2880,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;
    }