OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/zink: fix gs emulation xfb_info sizing

Browse Source 
cc: mesa-stable

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24634>
This commit is contained in:
Mike Blumenkrantz
2023-08-07 14:18:56 -04:00
committed by Marge Bot
parent fa5ebfbeb9
commit df238e8fc0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/nir/nir_passthrough_gs.c
View File

@@ -142,7 +142,7 @@ nir_create_passthrough_gs(const nir_shader_compiler_options *options,
nir->info.has_transform_feedback_varyings = prev_stage->info.has_transform_feedback_varyings;
memcpy(nir->info.xfb_stride, prev_stage->info.xfb_stride, sizeof(prev_stage->info.xfb_stride));
if (prev_stage->xfb_info) {
nir->xfb_info = mem_dup(prev_stage->xfb_info, sizeof(nir_xfb_info));
nir->xfb_info = mem_dup(prev_stage->xfb_info, nir_xfb_info_size(prev_stage->xfb_info->output_count));
}
bool handle_flat = nir->info.gs.output_primitive == MESA_PRIM_LINE_STRIP &&

2
src/gallium/drivers/zink/zink_compiler.c
View File

@@ -1214,7 +1214,7 @@ zink_create_quads_emulation_gs(const nir_shader_compiler_options *options,
nir->info.has_transform_feedback_varyings = prev_stage->info.has_transform_feedback_varyings;
memcpy(nir->info.xfb_stride, prev_stage->info.xfb_stride, sizeof(prev_stage->info.xfb_stride));
if (prev_stage->xfb_info) {
nir->xfb_info = mem_dup(prev_stage->xfb_info, sizeof(nir_xfb_info));
nir->xfb_info = mem_dup(prev_stage->xfb_info, nir_xfb_info_size(prev_stage->xfb_info->output_count));
}
nir_variable *in_vars[VARYING_SLOT_MAX];