AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/xfb: Preserve some xfb information when gathering from intrinsics.

Browse Source 
We need to remember which streamout buffers and streams were enabled,
even if the shader doesn't actually write any outputs to them,
because the API requires that we count vertices created by this shader
towards queries against those streams.

That information can be gathered by nir_gather_xfb_info_with_varyings
from the original NIR I/O variables that we get from the frontend,
but it isn't included in any intrinsics so would be otherwise lost here.

Cc: mesa-stable
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34317>
This commit is contained in:
Timur Kristóf
2025-04-01 13:03:19 +02:00
committed by Marge Bot
parent 1deb0536a1
commit a29b5857f7
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/compiler/nir/nir_gather_xfb_info.c
View File

@@ -447,6 +447,31 @@ nir_gather_xfb_info_from_intrinsics(nir_shader *nir)
for (unsigned i = 0; i < count; i++)
info->buffers[outputs[i].buffer].varying_count++;
/* Preserve some info from the pre-existing xfb info if the shader had any. */
if (nir->xfb_info) {
/* We need to remember which streamout buffers and streams were enabled,
* even if the shader doesn't actually write any outputs to them,
* because the API requires that we count vertices created by this shader
* towards queries against those streams.
*
* That information can be gathered by nir_gather_xfb_info_with_varyings
* from the original NIR I/O variables that we get from the frontend,
* but it isn't included in any intrinsics so would be otherwise lost here.
*
* Illustrated by the following test cases:
* dEQP-VK.transform_feedback.simple.multiquery_omit_write_*
*/
const uint32_t buffers_not_written = nir->xfb_info->buffers_written & ~info->buffers_written;
u_foreach_bit(buffer, buffers_not_written) {
const uint32_t stream = nir->xfb_info->buffer_to_stream[buffer];
info->streams_written |= BITFIELD_BIT(stream);
info->buffers_written |= BITFIELD_BIT(buffer);
info->buffer_to_stream[buffer] = stream;
info->buffers[buffer].stride = nir->xfb_info->buffers[buffer].stride;
info->buffers[buffer].varying_count = 0;
}
}
/* Replace original xfb info. */
ralloc_free(nir->xfb_info);
nir->xfb_info = info;