fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 20:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

llvmpipe: fix color fbfetch

Browse source 
with the unlowering pass, there is no longer a separate gl_LastFragData variable,
so this workaround just breaks color outputs

fixes dEQP-GLES31.functional.shaders.framebuffer_fetch.basic.last_frag_data

cc: mesa-stable

(cherry picked from commit 4b2022a8f5)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40752>
This commit is contained in:
Mike Blumenkrantz 2026-03-16 09:07:10 -04:00 • committed by Eric Engestrom
parent ad2384db21
commit d769e67c52
3 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4884,7 +4884,7 @@
"description": "llvmpipe: fix color fbfetch",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

1
src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
View file

@ -93,7 +93,6 @@ spec@!opengl 1.1@polygon-mode-offset@config 4: Expected white pixel on right edg
spec@!opengl 1.1@polygon-mode-offset@config 4: Expected white pixel on top edge,Fail
# Seen in https://gitlab.freedesktop.org/mesa/mesa/-/pipelines/1364513
dEQP-GLES31.functional.shaders.framebuffer_fetch.basic.last_frag_data,Fail
spec@arb_framebuffer_object@execution@msaa-alpha-to-coverage_alpha-to-one_write-z,Fail
spec@ovr_multiview@compiler@multiple-num-views-in-single-declaration-mismatch.vert,Fail

18
src/gallium/drivers/llvmpipe/lp_state_fs.c
View file

@ -1241,7 +1241,6 @@ generate_fs_loop(struct gallivm_state *gallivm,
LLVMBuildStore(builder, out, ptr);
}
bool has_cbuf0_write = false;
/* Color write - per fragment sample */
nir_foreach_shader_out_variable(var, nir) {
if (var->data.location < FRAG_RESULT_DATA0)
@ -1252,23 +1251,6 @@ generate_fs_loop(struct gallivm_state *gallivm,
unsigned cbuf = get_cbuf_location(var, s);
unsigned attrib = var->data.driver_location + s;
if ((cbuf < key->nr_cbufs) || (cbuf == 1 && dual_source_blend)) {
if (cbuf == 0) {
/* XXX: there is an edge case with FB fetch where gl_FragColor and
* gl_LastFragData[0] are used together. This creates both
* FRAG_RESULT_COLOR and FRAG_RESULT_DATA* output variables. This
* loop then writes to cbuf 0 twice, owerwriting the correct value
* from gl_FragColor with some garbage. This case is excercised in
* one of deqp tests. A similar bug can happen if
* gl_SecondaryFragColorEXT and gl_LastFragData[1] are mixed in
* the same fashion... This workaround will break if
* gl_LastFragData[0] goes in outputs list before
* gl_FragColor. This doesn't seem to happen though.
*/
if (has_cbuf0_write)
continue;
has_cbuf0_write = true;
}
for (unsigned chan = 0; chan < TGSI_NUM_CHANNELS; ++chan) {
if (outputs[attrib][chan]) {
/* XXX: just initialize outputs to point at colors[] and