From d42374c33b24e560d6244e14f2734358888ad064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Fri, 12 Jul 2024 10:46:12 +0200 Subject: [PATCH] Backport fix for Octave + llvmpipe Upstream MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30126 Upstream bug report: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11445 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2294145 --- ...te-params-for-feedback-draws-with-al.patch | 29 +++++++++++++++++++ mesa.spec | 1 + 2 files changed, 30 insertions(+) create mode 100644 0001-mesa-st-load-state-params-for-feedback-draws-with-al.patch diff --git a/0001-mesa-st-load-state-params-for-feedback-draws-with-al.patch b/0001-mesa-st-load-state-params-for-feedback-draws-with-al.patch new file mode 100644 index 0000000..711ab3b --- /dev/null +++ b/0001-mesa-st-load-state-params-for-feedback-draws-with-al.patch @@ -0,0 +1,29 @@ +From d83a0414727d682d9448305c8fe63c014b080e94 Mon Sep 17 00:00:00 2001 +From: Mike Blumenkrantz +Date: Thu, 11 Jul 2024 12:13:00 -0400 +Subject: [PATCH] mesa/st: load state params for feedback draws with + allow_st_finalize_nir_twice + +this should ensure that the params are always updated + +Fixes: 5eb0136a3c5 ("mesa/st: when creating draw shader variants, use the base nir and skip driver opts") +--- + src/mesa/state_tracker/st_draw_feedback.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c +index 0a60b5cd2f3..03d2bee2a71 100644 +--- a/src/mesa/state_tracker/st_draw_feedback.c ++++ b/src/mesa/state_tracker/st_draw_feedback.c +@@ -181,7 +181,7 @@ st_feedback_draw_vbo(struct gl_context *ctx, + * in gl_program_parameter_list because allow_constbuf0_as_real_buffer + * is set. + */ +- if (st->prefer_real_buffer_in_constbuf0 && params->StateFlags) ++ if ((st->prefer_real_buffer_in_constbuf0 || st->allow_st_finalize_nir_twice) && params->StateFlags) + _mesa_load_state_parameters(st->ctx, params); + + draw_set_constant_buffer_stride(draw, sizeof(float)); +-- +2.45.2 + diff --git a/mesa.spec b/mesa.spec index e030d81..9009e48 100644 --- a/mesa.spec +++ b/mesa.spec @@ -79,6 +79,7 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt Patch10: gnome-shell-glthread-disable.patch Patch11: 0001-llvmpipe-Init-eglQueryDmaBufModifiersEXT-num_modifie.patch Patch12: 0001-Revert-ac-radeonsi-remove-has_syncobj-has_fence_to_h.patch +Patch13: 0001-mesa-st-load-state-params-for-feedback-draws-with-al.patch # s390x only Patch100: fix-egl-on-s390x.patch