summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2022-04-26 10:23:36 -0400
committerDylan Baker <dylan.c.baker@intel.com>2022-05-10 21:23:14 -0700
commit0c50ee124a07d944156eb644ac5519331c8aad51 (patch)
treec344e4005ea23be537d1b05e69f5c2ef43e4c58a
parentf9cc403ebed850cd627e622b850f37e4b99ea408 (diff)
st/draw_feedback: set constant buffer stride
these shaders all do float-based reads, so using vec4 for robustness checks breaks gallivm cc: mesa-stable Reviewed-by: Dave Airlie <airlied@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16137> (cherry picked from commit a51e83b74e04ad47d7e61113aef3db2db53f2e8c)
-rw-r--r--.pick_status.json2
-rw-r--r--src/mesa/state_tracker/st_draw_feedback.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 5dd90c08ea8..cf2d84b08c8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -373,7 +373,7 @@
"description": "st/draw_feedback: set constant buffer stride",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c
index 6c46fbb6992..8b97d0b8adf 100644
--- a/src/mesa/state_tracker/st_draw_feedback.c
+++ b/src/mesa/state_tracker/st_draw_feedback.c
@@ -234,6 +234,7 @@ st_feedback_draw_vbo(struct gl_context *ctx,
if (st->prefer_real_buffer_in_constbuf0 && params->StateFlags)
_mesa_load_state_parameters(st->ctx, params);
+ draw_set_constant_buffer_stride(draw, sizeof(float));
draw_set_mapped_constant_buffer(draw, PIPE_SHADER_VERTEX, 0,
params->ParameterValues,
params->NumParameterValues * 4);