diff options
| author | Hyunjun Ko <zzoon@igalia.com> | 2020-04-06 04:55:19 +0000 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-04-09 14:16:57 -0700 |
| commit | d4ef9d6ac0444dcd8a20afb5ba5b7aa028f02a31 (patch) | |
| tree | f1f69f7cd8122b0617e7be0e59670a901ed8a58b | |
| parent | de3d7dbed521c40344c9f8b2b505b6e2b13a7636 (diff) | |
nir: fix wrong assignment to buffer in xfb_varyings_info
Tested with dEQP-VK.transform_feedback.fuzz.various_buffers.buffers100_instance_array_vertex
Signed-off-by: Hyunjun Ko <zzoon@igalia.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Cc: mesa-stable@lists.freedesktop.org
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4459>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4459>
(cherry picked from commit 9f174eb2df128dd89f61ac07b5d394c24668a43c)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_gather_xfb_info.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.pick_status.json b/.pick_status.json index 1b2214cb226..d285783e82a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1264,7 +1264,7 @@ "description": "nir: fix wrong assignment to buffer in xfb_varyings_info", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/compiler/nir/nir_gather_xfb_info.c b/src/compiler/nir/nir_gather_xfb_info.c index bcbc2a3a4c3..7a3ce7966d3 100644 --- a/src/compiler/nir/nir_gather_xfb_info.c +++ b/src/compiler/nir/nir_gather_xfb_info.c @@ -28,7 +28,7 @@ static void add_var_xfb_varying(nir_xfb_info *xfb, nir_xfb_varyings_info *varyings, - nir_variable *var, + unsigned buffer, unsigned offset, const struct glsl_type *type) { @@ -38,9 +38,9 @@ add_var_xfb_varying(nir_xfb_info *xfb, nir_xfb_varying_info *varying = &varyings->varyings[varyings->varying_count++]; varying->type = type; - varying->buffer = var->data.xfb.buffer; + varying->buffer = buffer; varying->offset = offset; - xfb->buffers[var->data.xfb.buffer].varying_count++; + xfb->buffers[buffer].varying_count++; } @@ -83,7 +83,7 @@ add_var_xfb_outputs(nir_xfb_info *xfb, if (!glsl_type_is_array(child_type) && !glsl_type_is_struct(child_type)) { - add_var_xfb_varying(xfb, varyings, var, *offset, type); + add_var_xfb_varying(xfb, varyings, buffer, *offset, type); varying_added = true; } @@ -138,7 +138,7 @@ add_var_xfb_outputs(nir_xfb_info *xfb, unsigned comp_offset = var->data.location_frac; if (!varying_added) { - add_var_xfb_varying(xfb, varyings, var, *offset, type); + add_var_xfb_varying(xfb, varyings, buffer, *offset, type); } while (comp_mask) { |