diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index dd69818e80b..45c626eb21e 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -26,7 +26,6 @@ spec@!opengl 1.0@gl-1.0-edgeflag,Fail spec@!opengl 1.0@gl-1.0-edgeflag-const,Fail spec@!opengl 1.0@gl-1.0-edgeflag-quads,Fail spec@!opengl 1.0@gl-1.0-no-op-paths,Fail -spec@!opengl 1.0@gl-1.0-spot-light,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.0@rasterpos,Crash spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=2,Fail diff --git a/src/etnaviv/ci/etnaviv-gc2000-fails.txt b/src/etnaviv/ci/etnaviv-gc2000-fails.txt index 8911eb2e534..d415e6887b2 100644 --- a/src/etnaviv/ci/etnaviv-gc2000-fails.txt +++ b/src/etnaviv/ci/etnaviv-gc2000-fails.txt @@ -738,7 +738,6 @@ spec@!opengl 1.0@gl-1.0-logicop@GL_XOR,Fail spec@!opengl 1.0@gl-1.0-no-op-paths,Fail spec@!opengl 1.0@gl-1.0-ortho-pos,Fail spec@!opengl 1.0@gl-1.0-scissor-stencil-clear,Fail -spec@!opengl 1.0@gl-1.0-spot-light,Fail spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.1@clipflat,Fail diff --git a/src/freedreno/ci/freedreno-a307-fails.txt b/src/freedreno/ci/freedreno-a307-fails.txt index 1695d185361..dc413ea1c92 100644 --- a/src/freedreno/ci/freedreno-a307-fails.txt +++ b/src/freedreno/ci/freedreno-a307-fails.txt @@ -183,7 +183,6 @@ spec@!opengl 1.0@gl-1.0-edgeflag,Crash spec@!opengl 1.0@gl-1.0-edgeflag-quads,Crash spec@!opengl 1.0@gl-1.0-no-op-paths,Fail spec@!opengl 1.0@gl-1.0-scissor-offscreen,Fail -spec@!opengl 1.0@gl-1.0-spot-light,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.0@rasterpos,Crash spec@!opengl 1.1@depthstencil-default_fb-blit,Fail diff --git a/src/freedreno/ci/freedreno-a420-fails.txt b/src/freedreno/ci/freedreno-a420-fails.txt index ba363e3cc24..9c65b7cc604 100644 --- a/src/freedreno/ci/freedreno-a420-fails.txt +++ b/src/freedreno/ci/freedreno-a420-fails.txt @@ -321,7 +321,6 @@ spec@!opengl 1.0@gl-1.0-edgeflag,Crash spec@!opengl 1.0@gl-1.0-edgeflag-quads,Crash spec@!opengl 1.0@gl-1.0-no-op-paths,Fail spec@!opengl 1.0@gl-1.0-scissor-offscreen,Fail -spec@!opengl 1.0@gl-1.0-spot-light,Fail spec@!opengl 1.0@rasterpos,Crash spec@!opengl 1.1@polygon-mode,Fail spec@!opengl 1.1@polygon-mode-facing,Fail diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index 4519985c60c..46b18581699 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -270,8 +270,6 @@ spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail # "Failure with Polygon Stipple set to fail mode." spec@!opengl 1.0@gl-1.0-no-op-paths,Fail -spec@!opengl 1.0@gl-1.0-spot-light,Fail - # crash in tgsi exec doing st_freedback_draw_vbo(). spec@!opengl 1.0@rasterpos,Crash diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 94059ddf7b4..2c233dc8473 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -276,8 +276,6 @@ spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail # "Failure with Polygon Stipple set to fail mode." spec@!opengl 1.0@gl-1.0-no-op-paths,Fail -spec@!opengl 1.0@gl-1.0-spot-light,Fail - # crash in tgsi exec doing st_freedback_draw_vbo(). spec@!opengl 1.0@rasterpos,Crash diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt index 06e6f48d0db..b52fbd96804 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt @@ -2,7 +2,6 @@ spec@!opengl 1.0@gl-1.0-beginend-coverage,Fail spec@!opengl 1.0@gl-1.0-beginend-coverage@glFlush,Fail spec@!opengl 1.0@gl-1.0-blend-func,Fail spec@!opengl 1.0@gl-1.0-no-op-paths,Fail -spec@!opengl 1.0@gl-1.0-spot-light,Fail spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail diff --git a/src/gallium/drivers/lima/ci/lima-fails.txt b/src/gallium/drivers/lima/ci/lima-fails.txt index c82a9e70db5..771678baf68 100644 --- a/src/gallium/drivers/lima/ci/lima-fails.txt +++ b/src/gallium/drivers/lima/ci/lima-fails.txt @@ -575,7 +575,6 @@ spec@!opengl 1.0@gl-1.0-no-op-paths,Fail spec@!opengl 1.0@gl-1.0-ortho-pos,Fail spec@!opengl 1.0@gl-1.0-rastercolor,Fail spec@!opengl 1.0@gl-1.0-scissor-bitmap,Fail -spec@!opengl 1.0@gl-1.0-spot-light,Fail spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.1@gl-1.1-xor-copypixels,Fail diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt index eed685ffa43..e2c3b768816 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt @@ -137,8 +137,6 @@ shaders@point-vertex-id gl_vertexid,Fail spec@!opengl 1.0@gl-1.0-no-op-paths,Fail -spec@!opengl 1.0@gl-1.0-spot-light,Fail - spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail spec@!opengl 1.1@depthstencil-default_fb-blit samples=16,Fail diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index a8afe376c0c..a5d8bb1a3af 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -728,11 +728,10 @@ calculate_light_attenuation(struct tnl_program *p, nir_ssa_def *spot = nir_fdot3(p->b, nir_fneg(p->b, VPpli), spot_dir_norm); - nir_ssa_def *slt = nir_slt(p->b, nir_channel(p->b, spot_dir_norm, 3), + nir_ssa_def *cmp = nir_flt(p->b, nir_channel(p->b, spot_dir_norm, 3), spot); - spot = nir_fabs(p->b, spot); spot = nir_fpow(p->b, spot, nir_channel(p->b, attenuation, 3)); - att = nir_fmul(p->b, slt, spot); + att = nir_bcsel(p->b, cmp, spot, nir_imm_zero(p->b, 1, 32)); } /* Calculate distance attenuation(See formula (2.4) at glspec 2.1 page 62): @@ -1399,7 +1398,6 @@ create_new_program( const struct state_key *key, nir_shader *s = b.shader; s->info.separate_shader = true; - s->info.use_legacy_math_rules = true; p.b = &b; diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt index ef9e9995ce0..aac462570f2 100644 --- a/src/panfrost/ci/panfrost-g52-fails.txt +++ b/src/panfrost/ci/panfrost-g52-fails.txt @@ -496,7 +496,6 @@ spec@!opengl 1.0@gl-1.0-edgeflag-const,Fail spec@!opengl 1.0@gl-1.0-edgeflag,Fail spec@!opengl 1.0@gl-1.0-edgeflag-quads,Fail spec@!opengl 1.0@gl-1.0-no-op-paths,Fail -spec@!opengl 1.0@gl-1.0-spot-light,Fail spec@!opengl 1.0@rasterpos,Crash spec@!opengl 1.1@getteximage-formats,Fail spec@!opengl 1.1@linestipple@Factor 2x,Fail