From 94dbadc2bf215b74f7cc991cb05049fce9db9727 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 26 Apr 2022 10:23:36 -0400 Subject: [PATCH] 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 Part-of: (cherry picked from commit a51e83b74e04ad47d7e61113aef3db2db53f2e8c) --- .pick_status.json | 2 +- src/mesa/state_tracker/st_draw_feedback.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 1525ed5c3df..6656a1c54f6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -332,7 +332,7 @@ "description": "st/draw_feedback: set constant buffer stride", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "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);