From 4c82cdcb7e8ec71f96b2a040e046ff798f4d2d62 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 10 Nov 2020 12:00:16 +0100 Subject: [PATCH] microsoft/compiler: inline some struct-declarations We don't need to refer to these by name anywhere, so let's just inline these for readability reasons. Reviewed-by: Jesse Natalie Part-of: --- src/microsoft/compiler/dxil_signature.h | 47 +++++++++++-------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/src/microsoft/compiler/dxil_signature.h b/src/microsoft/compiler/dxil_signature.h index 8fbcc479346..ff8823151b4 100644 --- a/src/microsoft/compiler/dxil_signature.h +++ b/src/microsoft/compiler/dxil_signature.h @@ -79,34 +79,29 @@ struct dxil_psv_signature_element { uint8_t reserved; }; -struct dxil_vs_info { - char output_position_present; -}; - -struct dxil_gs_info { - uint32_t input_primitive; - uint32_t output_toplology; - uint32_t output_stream_mask; - char output_position_present; -}; - -struct dxil_ps_info { - char depth_output; - char sample_frequency; -}; - -/* Maximum sized defining the union size (MSInfo)*/ -struct dxil_max_sized_info { - uint32_t dummy1[3]; - uint16_t dummy2[2]; -}; - struct dxil_psv_runtime_info_0 { union { - struct dxil_vs_info vs; - struct dxil_gs_info gs; - struct dxil_ps_info ps; - struct dxil_max_sized_info dummy; + struct { + char output_position_present; + } vs; + + struct { + uint32_t input_primitive; + uint32_t output_toplology; + uint32_t output_stream_mask; + char output_position_present; + } gs; + + struct { + char depth_output; + char sample_frequency; + } ps; + + /* Maximum sized defining the union size (MSInfo)*/ + struct { + uint32_t dummy1[3]; + uint16_t dummy2[2]; + } dummy; }; uint32_t min_expected_wave_lane_count; // minimum lane count required, 0 if unused uint32_t max_expected_wave_lane_count; // maximum lane count required, 0xffffffff if unused