diff --git a/src/xenia/gpu/d3d12/d3d12_command_processor.cc b/src/xenia/gpu/d3d12/d3d12_command_processor.cc index fa0fd4ab6..9e4bdba44 100644 --- a/src/xenia/gpu/d3d12/d3d12_command_processor.cc +++ b/src/xenia/gpu/d3d12/d3d12_command_processor.cc @@ -3330,32 +3330,39 @@ void D3D12CommandProcessor::UpdateSystemConstantValues( float(pa_su_point_minmax.min_size) * (2.0f / 16.0f); float point_vertex_diameter_max = float(pa_su_point_minmax.max_size) * (2.0f / 16.0f); - float point_constant_radius_x = - float(pa_su_point_size.width) * (1.0f / 16.0f); - float point_constant_radius_y = - float(pa_su_point_size.height) * (1.0f / 16.0f); + float point_constant_diameter_x = + float(pa_su_point_size.width) * (2.0f / 16.0f); + float point_constant_diameter_y = + float(pa_su_point_size.height) * (2.0f / 16.0f); dirty |= system_constants_.point_vertex_diameter_min != point_vertex_diameter_min; dirty |= system_constants_.point_vertex_diameter_max != point_vertex_diameter_max; dirty |= - system_constants_.point_constant_radius[0] != point_constant_radius_x; + system_constants_.point_constant_diameter[0] != point_constant_diameter_x; dirty |= - system_constants_.point_constant_radius[1] != point_constant_radius_y; + system_constants_.point_constant_diameter[1] != point_constant_diameter_y; system_constants_.point_vertex_diameter_min = point_vertex_diameter_min; system_constants_.point_vertex_diameter_max = point_vertex_diameter_max; - system_constants_.point_constant_radius[0] = point_constant_radius_x; - system_constants_.point_constant_radius[1] = point_constant_radius_y; - float point_screen_to_ndc_x = + system_constants_.point_constant_diameter[0] = point_constant_diameter_x; + system_constants_.point_constant_diameter[1] = point_constant_diameter_y; + // 2 because 1 in the NDC is half of the viewport's axis, 0.5 for diameter to + // radius conversion to avoid multiplying the per-vertex diameter by an + // additional constant in the shader. + float point_screen_diameter_to_ndc_radius_x = (/* 0.5f * 2.0f * */ float(resolution_scale_x)) / std::max(viewport_info.xy_extent[0], uint32_t(1)); - float point_screen_to_ndc_y = + float point_screen_diameter_to_ndc_radius_y = (/* 0.5f * 2.0f * */ float(resolution_scale_y)) / std::max(viewport_info.xy_extent[1], uint32_t(1)); - dirty |= system_constants_.point_screen_to_ndc[0] != point_screen_to_ndc_x; - dirty |= system_constants_.point_screen_to_ndc[1] != point_screen_to_ndc_y; - system_constants_.point_screen_to_ndc[0] = point_screen_to_ndc_x; - system_constants_.point_screen_to_ndc[1] = point_screen_to_ndc_y; + dirty |= system_constants_.point_screen_diameter_to_ndc_radius[0] != + point_screen_diameter_to_ndc_radius_x; + dirty |= system_constants_.point_screen_diameter_to_ndc_radius[1] != + point_screen_diameter_to_ndc_radius_y; + system_constants_.point_screen_diameter_to_ndc_radius[0] = + point_screen_diameter_to_ndc_radius_x; + system_constants_.point_screen_diameter_to_ndc_radius[1] = + point_screen_diameter_to_ndc_radius_y; // Interpolator sampling pattern, centroid or center. uint32_t interpolator_sampling_pattern = diff --git a/src/xenia/gpu/dxbc_shader_translator.cc b/src/xenia/gpu/dxbc_shader_translator.cc index c2a4d8540..2736fe33a 100644 --- a/src/xenia/gpu/dxbc_shader_translator.cc +++ b/src/xenia/gpu/dxbc_shader_translator.cc @@ -2040,9 +2040,9 @@ const DxbcShaderTranslator::SystemConstantRdef {"xe_point_vertex_diameter_max", ShaderRdefTypeIndex::kFloat, sizeof(float)}, - {"xe_point_constant_radius", ShaderRdefTypeIndex::kFloat2, + {"xe_point_constant_diameter", ShaderRdefTypeIndex::kFloat2, sizeof(float) * 2}, - {"xe_point_screen_to_ndc", ShaderRdefTypeIndex::kFloat2, + {"xe_point_screen_diameter_to_ndc_radius", ShaderRdefTypeIndex::kFloat2, sizeof(float) * 2}, {"xe_interpolator_sampling_pattern", ShaderRdefTypeIndex::kUint, diff --git a/src/xenia/gpu/dxbc_shader_translator.h b/src/xenia/gpu/dxbc_shader_translator.h index f2fae6cc6..e8009c210 100644 --- a/src/xenia/gpu/dxbc_shader_translator.h +++ b/src/xenia/gpu/dxbc_shader_translator.h @@ -242,9 +242,10 @@ class DxbcShaderTranslator : public ShaderTranslator { float ndc_offset[3]; float point_vertex_diameter_max; - float point_constant_radius[2]; - // Screen point size * 2 (but not supersampled) -> size in NDC. - float point_screen_to_ndc[2]; + float point_constant_diameter[2]; + // Diameter in guest screen coordinates > radius (0.5 * diameter) in the NDC + // for the host viewport. + float point_screen_diameter_to_ndc_radius[2]; uint32_t interpolator_sampling_pattern; uint32_t ps_param_gen; @@ -356,8 +357,8 @@ class DxbcShaderTranslator : public ShaderTranslator { kNDCOffset, kPointVertexDiameterMax, - kPointConstantRadius, - kPointScreenToNDC, + kPointConstantDiameter, + kPointScreenDiameterToNDCRadius, kInterpolatorSamplingPattern, kPSParamGen, diff --git a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/continuous_quad_hs.h b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/continuous_quad_hs.h index 18faf5d6a..6ad9c3f3e 100644 --- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/continuous_quad_hs.h +++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/continuous_quad_hs.h @@ -19,8 +19,8 @@ // float xe_point_vertex_diameter_min;// Offset: 140 Size: 4 [unused] // float3 xe_ndc_offset; // Offset: 144 Size: 12 [unused] // float xe_point_vertex_diameter_max;// Offset: 156 Size: 4 [unused] -// float2 xe_point_constant_radius; // Offset: 160 Size: 8 [unused] -// float2 xe_point_screen_to_ndc; // Offset: 168 Size: 8 [unused] +// float2 xe_point_constant_diameter; // Offset: 160 Size: 8 [unused] +// float2 xe_point_screen_diameter_to_ndc_radius;// Offset: 168 Size: 8 [unused] // uint xe_interpolator_sampling_pattern;// Offset: 176 Size: 4 [unused] // uint xe_ps_param_gen; // Offset: 180 Size: 4 [unused] // uint2 xe_sample_count_log2; // Offset: 184 Size: 8 [unused] @@ -121,21 +121,21 @@ ret const BYTE continuous_quad_hs[] = { - 68, 88, 66, 67, 41, 61, - 68, 236, 233, 38, 162, 138, - 209, 48, 160, 247, 155, 238, - 65, 82, 1, 0, 0, 0, - 12, 14, 0, 0, 6, 0, + 68, 88, 66, 67, 56, 101, + 228, 239, 192, 85, 186, 185, + 211, 32, 109, 84, 115, 240, + 153, 130, 1, 0, 0, 0, + 28, 14, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, - 216, 10, 0, 0, 12, 11, - 0, 0, 64, 11, 0, 0, - 4, 12, 0, 0, 112, 13, + 232, 10, 0, 0, 28, 11, + 0, 0, 80, 11, 0, 0, + 20, 12, 0, 0, 128, 13, 0, 0, 82, 68, 69, 70, - 152, 10, 0, 0, 1, 0, + 168, 10, 0, 0, 1, 0, 0, 0, 120, 0, 0, 0, 1, 0, 0, 0, 60, 0, 0, 0, 1, 5, 83, 72, - 0, 5, 0, 0, 110, 10, + 0, 5, 0, 0, 126, 10, 0, 0, 19, 19, 68, 37, 60, 0, 0, 0, 24, 0, 0, 0, 40, 0, 0, 0, @@ -235,137 +235,137 @@ const BYTE continuous_quad_hs[] = 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 156, 7, + 0, 0, 0, 0, 158, 7, 0, 0, 168, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 179, 7, 0, 0, + 0, 0, 197, 7, 0, 0, 176, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 212, 7, 0, 0, 180, 0, + 230, 7, 0, 0, 180, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 228, 7, + 0, 0, 0, 0, 246, 7, 0, 0, 184, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 116, 6, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 249, 7, 0, 0, + 0, 0, 11, 8, 0, 0, 192, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 28, 8, 0, 0, 0, 0, + 44, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 64, 8, 0, 0, 224, 0, + 80, 8, 0, 0, 224, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 85, 8, + 0, 0, 0, 0, 101, 8, 0, 0, 228, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 52, 7, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 109, 8, 0, 0, + 0, 0, 125, 8, 0, 0, 232, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 126, 8, 0, 0, 236, 0, + 142, 8, 0, 0, 236, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 166, 8, + 0, 0, 0, 0, 182, 8, 0, 0, 240, 0, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 184, 8, 0, 0, + 0, 0, 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 220, 8, 0, 0, + 0, 0, 236, 8, 0, 0, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 247, 8, 0, 0, 8, 1, + 7, 9, 0, 0, 8, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 17, 9, + 0, 0, 0, 0, 33, 9, 0, 0, 16, 1, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 51, 9, 0, 0, + 0, 0, 67, 9, 0, 0, 32, 1, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 68, 9, 0, 0, 0, 0, + 84, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 104, 9, 0, 0, 64, 1, + 120, 9, 0, 0, 64, 1, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 136, 9, + 0, 0, 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 172, 9, + 0, 0, 0, 0, 188, 9, 0, 0, 80, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 136, 9, 0, 0, + 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 197, 9, 0, 0, + 0, 0, 213, 9, 0, 0, 96, 1, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, - 216, 9, 0, 0, 0, 0, + 232, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 252, 9, 0, 0, 160, 1, + 12, 10, 0, 0, 160, 1, 0, 0, 32, 0, 0, 0, - 0, 0, 0, 0, 20, 10, + 0, 0, 0, 0, 36, 10, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 56, 10, + 0, 0, 0, 0, 72, 10, 0, 0, 192, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 136, 9, 0, 0, + 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 86, 10, 0, 0, + 0, 0, 102, 10, 0, 0, 208, 1, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 184, 8, 0, 0, 0, 0, + 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, @@ -455,11 +455,14 @@ const BYTE continuous_quad_hs[] = 0, 120, 101, 95, 112, 111, 105, 110, 116, 95, 99, 111, 110, 115, 116, 97, 110, 116, - 95, 114, 97, 100, 105, 117, - 115, 0, 120, 101, 95, 112, - 111, 105, 110, 116, 95, 115, - 99, 114, 101, 101, 110, 95, - 116, 111, 95, 110, 100, 99, + 95, 100, 105, 97, 109, 101, + 116, 101, 114, 0, 120, 101, + 95, 112, 111, 105, 110, 116, + 95, 115, 99, 114, 101, 101, + 110, 95, 100, 105, 97, 109, + 101, 116, 101, 114, 95, 116, + 111, 95, 110, 100, 99, 95, + 114, 97, 100, 105, 117, 115, 0, 120, 101, 95, 105, 110, 116, 101, 114, 112, 111, 108, 97, 116, 111, 114, 95, 115, @@ -477,230 +480,230 @@ const BYTE continuous_quad_hs[] = 105, 122, 122, 108, 101, 100, 95, 115, 105, 103, 110, 115, 0, 117, 105, 110, 116, 52, - 0, 171, 171, 171, 1, 0, - 19, 0, 1, 0, 4, 0, - 2, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, - 95, 116, 101, 120, 116, 117, - 114, 101, 115, 95, 114, 101, - 115, 111, 108, 118, 101, 100, - 0, 120, 101, 95, 97, 108, - 112, 104, 97, 95, 116, 101, - 115, 116, 95, 114, 101, 102, - 101, 114, 101, 110, 99, 101, - 0, 120, 101, 95, 97, 108, - 112, 104, 97, 95, 116, 111, - 95, 109, 97, 115, 107, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 51, 50, 98, - 112, 112, 95, 116, 105, 108, - 101, 95, 112, 105, 116, 99, - 104, 95, 100, 119, 111, 114, - 100, 115, 95, 115, 99, 97, - 108, 101, 100, 0, 120, 101, - 95, 99, 111, 108, 111, 114, - 95, 101, 120, 112, 95, 98, - 105, 97, 115, 0, 1, 0, - 3, 0, 1, 0, 4, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 172, 6, 0, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 112, 111, 108, 121, 95, - 111, 102, 102, 115, 101, 116, - 95, 102, 114, 111, 110, 116, - 0, 120, 101, 95, 101, 100, - 114, 97, 109, 95, 112, 111, - 108, 121, 95, 111, 102, 102, - 115, 101, 116, 95, 98, 97, - 99, 107, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 100, 101, 112, 116, 104, 95, - 98, 97, 115, 101, 95, 100, - 119, 111, 114, 100, 115, 95, - 115, 99, 97, 108, 101, 100, - 0, 120, 101, 95, 101, 100, - 114, 97, 109, 95, 115, 116, - 101, 110, 99, 105, 108, 0, - 1, 0, 19, 0, 1, 0, - 4, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 19, 8, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 114, 116, 95, - 98, 97, 115, 101, 95, 100, - 119, 111, 114, 100, 115, 95, - 115, 99, 97, 108, 101, 100, 0, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 116, + 101, 120, 116, 117, 114, 101, + 115, 95, 114, 101, 115, 111, + 108, 118, 101, 100, 0, 120, + 101, 95, 97, 108, 112, 104, + 97, 95, 116, 101, 115, 116, + 95, 114, 101, 102, 101, 114, + 101, 110, 99, 101, 0, 120, + 101, 95, 97, 108, 112, 104, + 97, 95, 116, 111, 95, 109, + 97, 115, 107, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 51, 50, 98, 112, 112, + 95, 116, 105, 108, 101, 95, + 112, 105, 116, 99, 104, 95, + 100, 119, 111, 114, 100, 115, + 95, 115, 99, 97, 108, 101, + 100, 0, 120, 101, 95, 99, + 111, 108, 111, 114, 95, 101, + 120, 112, 95, 98, 105, 97, + 115, 0, 1, 0, 3, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 8, + 0, 0, 0, 0, 172, 6, 0, 0, 120, 101, 95, 101, - 100, 114, 97, 109, 95, 114, - 116, 95, 102, 111, 114, 109, - 97, 116, 95, 102, 108, 97, - 103, 115, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 114, 116, 95, 99, 108, 97, - 109, 112, 0, 171, 1, 0, - 3, 0, 1, 0, 4, 0, - 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 172, 6, 0, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 107, 101, - 101, 112, 95, 109, 97, 115, - 107, 0, 171, 171, 1, 0, + 100, 114, 97, 109, 95, 112, + 111, 108, 121, 95, 111, 102, + 102, 115, 101, 116, 95, 102, + 114, 111, 110, 116, 0, 120, + 101, 95, 101, 100, 114, 97, + 109, 95, 112, 111, 108, 121, + 95, 111, 102, 102, 115, 101, + 116, 95, 98, 97, 99, 107, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 100, 101, + 112, 116, 104, 95, 98, 97, + 115, 101, 95, 100, 119, 111, + 114, 100, 115, 95, 115, 99, + 97, 108, 101, 100, 0, 120, + 101, 95, 101, 100, 114, 97, + 109, 95, 115, 116, 101, 110, + 99, 105, 108, 0, 1, 0, 19, 0, 1, 0, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, + 37, 8, 0, 0, 120, 101, 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 98, 108, - 101, 110, 100, 95, 102, 97, - 99, 116, 111, 114, 115, 95, - 111, 112, 115, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 98, 108, 101, 110, 100, - 95, 99, 111, 110, 115, 116, - 97, 110, 116, 0, 77, 105, - 99, 114, 111, 115, 111, 102, - 116, 32, 40, 82, 41, 32, - 72, 76, 83, 76, 32, 83, - 104, 97, 100, 101, 114, 32, - 67, 111, 109, 112, 105, 108, - 101, 114, 32, 49, 48, 46, - 49, 0, 171, 171, 73, 83, - 71, 78, 44, 0, 0, 0, - 1, 0, 0, 0, 8, 0, - 0, 0, 32, 0, 0, 0, + 95, 114, 116, 95, 98, 97, + 115, 101, 95, 100, 119, 111, + 114, 100, 115, 95, 115, 99, + 97, 108, 101, 100, 0, 171, + 1, 0, 19, 0, 1, 0, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 1, 1, - 0, 0, 88, 69, 86, 69, - 82, 84, 69, 88, 73, 68, - 0, 171, 79, 83, 71, 78, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 37, 8, 0, 0, + 120, 101, 95, 101, 100, 114, + 97, 109, 95, 114, 116, 95, + 102, 111, 114, 109, 97, 116, + 95, 102, 108, 97, 103, 115, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 114, 116, + 95, 99, 108, 97, 109, 112, + 0, 171, 1, 0, 3, 0, + 1, 0, 4, 0, 4, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 172, 6, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 107, 101, 101, 112, + 95, 109, 97, 115, 107, 0, + 171, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 98, 108, 101, 110, + 100, 95, 102, 97, 99, 116, + 111, 114, 115, 95, 111, 112, + 115, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 98, + 108, 101, 110, 100, 95, 99, + 111, 110, 115, 116, 97, 110, + 116, 0, 77, 105, 99, 114, + 111, 115, 111, 102, 116, 32, + 40, 82, 41, 32, 72, 76, + 83, 76, 32, 83, 104, 97, + 100, 101, 114, 32, 67, 111, + 109, 112, 105, 108, 101, 114, + 32, 49, 48, 46, 49, 0, + 171, 171, 73, 83, 71, 78, 44, 0, 0, 0, 1, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 1, 14, 0, 0, + 0, 0, 1, 1, 0, 0, 88, 69, 86, 69, 82, 84, 69, 88, 73, 68, 0, 171, - 80, 67, 83, 71, 188, 0, - 0, 0, 6, 0, 0, 0, - 8, 0, 0, 0, 152, 0, - 0, 0, 0, 0, 0, 0, - 11, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, - 1, 14, 0, 0, 152, 0, + 79, 83, 71, 78, 44, 0, 0, 0, 1, 0, 0, 0, - 11, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, - 1, 14, 0, 0, 152, 0, - 0, 0, 2, 0, 0, 0, - 11, 0, 0, 0, 3, 0, - 0, 0, 2, 0, 0, 0, - 1, 14, 0, 0, 152, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 1, 14, 0, 0, 88, 69, + 86, 69, 82, 84, 69, 88, + 73, 68, 0, 171, 80, 67, + 83, 71, 188, 0, 0, 0, + 6, 0, 0, 0, 8, 0, + 0, 0, 152, 0, 0, 0, + 0, 0, 0, 0, 11, 0, 0, 0, 3, 0, 0, 0, - 11, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 1, 14, + 0, 0, 152, 0, 0, 0, + 1, 0, 0, 0, 11, 0, 0, 0, 3, 0, 0, 0, - 1, 14, 0, 0, 166, 0, - 0, 0, 0, 0, 0, 0, - 12, 0, 0, 0, 3, 0, - 0, 0, 4, 0, 0, 0, - 1, 14, 0, 0, 166, 0, - 0, 0, 1, 0, 0, 0, - 12, 0, 0, 0, 3, 0, - 0, 0, 5, 0, 0, 0, - 1, 14, 0, 0, 83, 86, - 95, 84, 101, 115, 115, 70, - 97, 99, 116, 111, 114, 0, - 83, 86, 95, 73, 110, 115, - 105, 100, 101, 84, 101, 115, - 115, 70, 97, 99, 116, 111, - 114, 0, 171, 171, 83, 72, - 69, 88, 100, 1, 0, 0, - 81, 0, 3, 0, 89, 0, - 0, 0, 113, 0, 0, 1, - 147, 32, 0, 1, 148, 32, - 0, 1, 149, 24, 0, 1, - 150, 32, 0, 1, 151, 24, - 0, 1, 106, 8, 0, 1, - 89, 0, 0, 7, 70, 142, - 48, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 115, 0, - 0, 1, 153, 0, 0, 2, - 4, 0, 0, 0, 95, 0, - 0, 2, 0, 112, 1, 0, - 103, 0, 0, 4, 18, 32, - 16, 0, 0, 0, 0, 0, - 11, 0, 0, 0, 103, 0, - 0, 4, 18, 32, 16, 0, + 1, 0, 0, 0, 1, 14, + 0, 0, 152, 0, 0, 0, + 2, 0, 0, 0, 11, 0, + 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 1, 14, + 0, 0, 152, 0, 0, 0, + 3, 0, 0, 0, 11, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 1, 14, + 0, 0, 166, 0, 0, 0, + 0, 0, 0, 0, 12, 0, + 0, 0, 3, 0, 0, 0, + 4, 0, 0, 0, 1, 14, + 0, 0, 166, 0, 0, 0, 1, 0, 0, 0, 12, 0, - 0, 0, 103, 0, 0, 4, - 18, 32, 16, 0, 2, 0, - 0, 0, 13, 0, 0, 0, - 103, 0, 0, 4, 18, 32, - 16, 0, 3, 0, 0, 0, - 14, 0, 0, 0, 104, 0, - 0, 2, 1, 0, 0, 0, - 91, 0, 0, 4, 18, 32, - 16, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 54, 0, - 0, 4, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 112, - 1, 0, 54, 0, 0, 8, - 18, 32, 144, 0, 10, 0, - 16, 0, 0, 0, 0, 0, - 42, 128, 48, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 5, 0, 0, 0, 1, 14, + 0, 0, 83, 86, 95, 84, + 101, 115, 115, 70, 97, 99, + 116, 111, 114, 0, 83, 86, + 95, 73, 110, 115, 105, 100, + 101, 84, 101, 115, 115, 70, + 97, 99, 116, 111, 114, 0, + 171, 171, 83, 72, 69, 88, + 100, 1, 0, 0, 81, 0, + 3, 0, 89, 0, 0, 0, + 113, 0, 0, 1, 147, 32, + 0, 1, 148, 32, 0, 1, + 149, 24, 0, 1, 150, 32, + 0, 1, 151, 24, 0, 1, + 106, 8, 0, 1, 89, 0, + 0, 7, 70, 142, 48, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 62, 0, - 0, 1, 115, 0, 0, 1, - 153, 0, 0, 2, 2, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 115, 0, 0, 1, + 153, 0, 0, 2, 4, 0, 0, 0, 95, 0, 0, 2, 0, 112, 1, 0, 103, 0, 0, 4, 18, 32, 16, 0, - 4, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 11, 0, 0, 0, 103, 0, 0, 4, - 18, 32, 16, 0, 5, 0, - 0, 0, 16, 0, 0, 0, - 104, 0, 0, 2, 1, 0, - 0, 0, 91, 0, 0, 4, + 18, 32, 16, 0, 1, 0, + 0, 0, 12, 0, 0, 0, + 103, 0, 0, 4, 18, 32, + 16, 0, 2, 0, 0, 0, + 13, 0, 0, 0, 103, 0, + 0, 4, 18, 32, 16, 0, + 3, 0, 0, 0, 14, 0, + 0, 0, 104, 0, 0, 2, + 1, 0, 0, 0, 91, 0, + 0, 4, 18, 32, 16, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 54, 0, 0, 4, + 18, 0, 16, 0, 0, 0, + 0, 0, 10, 112, 1, 0, + 54, 0, 0, 8, 18, 32, + 144, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 42, 128, + 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 115, 0, 0, 1, 153, 0, + 0, 2, 2, 0, 0, 0, + 95, 0, 0, 2, 0, 112, + 1, 0, 103, 0, 0, 4, 18, 32, 16, 0, 4, 0, - 0, 0, 2, 0, 0, 0, - 54, 0, 0, 4, 18, 0, - 16, 0, 0, 0, 0, 0, - 10, 112, 1, 0, 54, 0, - 0, 9, 18, 32, 208, 0, - 4, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, - 42, 128, 48, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 103, 0, 0, 4, 18, 32, + 16, 0, 5, 0, 0, 0, + 16, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, + 91, 0, 0, 4, 18, 32, + 16, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 54, 0, + 0, 4, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 112, + 1, 0, 54, 0, 0, 9, + 18, 32, 208, 0, 4, 0, + 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 42, 128, + 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 62, 0, - 0, 1, 83, 84, 65, 84, - 148, 0, 0, 0, 6, 0, - 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 5, 0, + 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 148, 0, + 0, 0, 6, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, + 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -708,17 +711,16 @@ const BYTE continuous_quad_hs[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 11, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 11, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 4, 0, + 3, 0, 0, 0, 4, 0, 0, 0, 3, 0, 0, 0, - 4, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0 + 0, 0, 0, 0, 0, 0 }; diff --git a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/continuous_triangle_hs.h b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/continuous_triangle_hs.h index a77c56ffc..bf8d8ac4b 100644 --- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/continuous_triangle_hs.h +++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/continuous_triangle_hs.h @@ -19,8 +19,8 @@ // float xe_point_vertex_diameter_min;// Offset: 140 Size: 4 [unused] // float3 xe_ndc_offset; // Offset: 144 Size: 12 [unused] // float xe_point_vertex_diameter_max;// Offset: 156 Size: 4 [unused] -// float2 xe_point_constant_radius; // Offset: 160 Size: 8 [unused] -// float2 xe_point_screen_to_ndc; // Offset: 168 Size: 8 [unused] +// float2 xe_point_constant_diameter; // Offset: 160 Size: 8 [unused] +// float2 xe_point_screen_diameter_to_ndc_radius;// Offset: 168 Size: 8 [unused] // uint xe_interpolator_sampling_pattern;// Offset: 176 Size: 4 [unused] // uint xe_ps_param_gen; // Offset: 180 Size: 4 [unused] // uint2 xe_sample_count_log2; // Offset: 184 Size: 8 [unused] @@ -112,21 +112,21 @@ ret const BYTE continuous_triangle_hs[] = { - 68, 88, 66, 67, 186, 50, - 224, 20, 247, 162, 237, 207, - 151, 21, 132, 253, 255, 73, - 27, 33, 1, 0, 0, 0, - 124, 13, 0, 0, 6, 0, + 68, 88, 66, 67, 157, 238, + 46, 85, 189, 214, 238, 189, + 170, 130, 106, 213, 101, 223, + 102, 58, 1, 0, 0, 0, + 140, 13, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, - 216, 10, 0, 0, 12, 11, - 0, 0, 64, 11, 0, 0, - 212, 11, 0, 0, 224, 12, + 232, 10, 0, 0, 28, 11, + 0, 0, 80, 11, 0, 0, + 228, 11, 0, 0, 240, 12, 0, 0, 82, 68, 69, 70, - 152, 10, 0, 0, 1, 0, + 168, 10, 0, 0, 1, 0, 0, 0, 120, 0, 0, 0, 1, 0, 0, 0, 60, 0, 0, 0, 1, 5, 83, 72, - 0, 5, 0, 0, 110, 10, + 0, 5, 0, 0, 126, 10, 0, 0, 19, 19, 68, 37, 60, 0, 0, 0, 24, 0, 0, 0, 40, 0, 0, 0, @@ -226,137 +226,137 @@ const BYTE continuous_triangle_hs[] = 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 156, 7, + 0, 0, 0, 0, 158, 7, 0, 0, 168, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 179, 7, 0, 0, + 0, 0, 197, 7, 0, 0, 176, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 212, 7, 0, 0, 180, 0, + 230, 7, 0, 0, 180, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 228, 7, + 0, 0, 0, 0, 246, 7, 0, 0, 184, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 116, 6, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 249, 7, 0, 0, + 0, 0, 11, 8, 0, 0, 192, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 28, 8, 0, 0, 0, 0, + 44, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 64, 8, 0, 0, 224, 0, + 80, 8, 0, 0, 224, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 85, 8, + 0, 0, 0, 0, 101, 8, 0, 0, 228, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 52, 7, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 109, 8, 0, 0, + 0, 0, 125, 8, 0, 0, 232, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 126, 8, 0, 0, 236, 0, + 142, 8, 0, 0, 236, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 166, 8, + 0, 0, 0, 0, 182, 8, 0, 0, 240, 0, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 184, 8, 0, 0, + 0, 0, 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 220, 8, 0, 0, + 0, 0, 236, 8, 0, 0, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 247, 8, 0, 0, 8, 1, + 7, 9, 0, 0, 8, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 17, 9, + 0, 0, 0, 0, 33, 9, 0, 0, 16, 1, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 51, 9, 0, 0, + 0, 0, 67, 9, 0, 0, 32, 1, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 68, 9, 0, 0, 0, 0, + 84, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 104, 9, 0, 0, 64, 1, + 120, 9, 0, 0, 64, 1, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 136, 9, + 0, 0, 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 172, 9, + 0, 0, 0, 0, 188, 9, 0, 0, 80, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 136, 9, 0, 0, + 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 197, 9, 0, 0, + 0, 0, 213, 9, 0, 0, 96, 1, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, - 216, 9, 0, 0, 0, 0, + 232, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 252, 9, 0, 0, 160, 1, + 12, 10, 0, 0, 160, 1, 0, 0, 32, 0, 0, 0, - 0, 0, 0, 0, 20, 10, + 0, 0, 0, 0, 36, 10, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 56, 10, + 0, 0, 0, 0, 72, 10, 0, 0, 192, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 136, 9, 0, 0, + 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 86, 10, 0, 0, + 0, 0, 102, 10, 0, 0, 208, 1, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 184, 8, 0, 0, 0, 0, + 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, @@ -446,11 +446,14 @@ const BYTE continuous_triangle_hs[] = 0, 120, 101, 95, 112, 111, 105, 110, 116, 95, 99, 111, 110, 115, 116, 97, 110, 116, - 95, 114, 97, 100, 105, 117, - 115, 0, 120, 101, 95, 112, - 111, 105, 110, 116, 95, 115, - 99, 114, 101, 101, 110, 95, - 116, 111, 95, 110, 100, 99, + 95, 100, 105, 97, 109, 101, + 116, 101, 114, 0, 120, 101, + 95, 112, 111, 105, 110, 116, + 95, 115, 99, 114, 101, 101, + 110, 95, 100, 105, 97, 109, + 101, 116, 101, 114, 95, 116, + 111, 95, 110, 100, 99, 95, + 114, 97, 100, 105, 117, 115, 0, 120, 101, 95, 105, 110, 116, 101, 114, 112, 111, 108, 97, 116, 111, 114, 95, 115, @@ -468,224 +471,223 @@ const BYTE continuous_triangle_hs[] = 105, 122, 122, 108, 101, 100, 95, 115, 105, 103, 110, 115, 0, 117, 105, 110, 116, 52, - 0, 171, 171, 171, 1, 0, - 19, 0, 1, 0, 4, 0, - 2, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, - 95, 116, 101, 120, 116, 117, - 114, 101, 115, 95, 114, 101, - 115, 111, 108, 118, 101, 100, - 0, 120, 101, 95, 97, 108, - 112, 104, 97, 95, 116, 101, - 115, 116, 95, 114, 101, 102, - 101, 114, 101, 110, 99, 101, - 0, 120, 101, 95, 97, 108, - 112, 104, 97, 95, 116, 111, - 95, 109, 97, 115, 107, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 51, 50, 98, - 112, 112, 95, 116, 105, 108, - 101, 95, 112, 105, 116, 99, - 104, 95, 100, 119, 111, 114, - 100, 115, 95, 115, 99, 97, - 108, 101, 100, 0, 120, 101, - 95, 99, 111, 108, 111, 114, - 95, 101, 120, 112, 95, 98, - 105, 97, 115, 0, 1, 0, - 3, 0, 1, 0, 4, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 172, 6, 0, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 112, 111, 108, 121, 95, - 111, 102, 102, 115, 101, 116, - 95, 102, 114, 111, 110, 116, - 0, 120, 101, 95, 101, 100, - 114, 97, 109, 95, 112, 111, - 108, 121, 95, 111, 102, 102, - 115, 101, 116, 95, 98, 97, - 99, 107, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 100, 101, 112, 116, 104, 95, - 98, 97, 115, 101, 95, 100, - 119, 111, 114, 100, 115, 95, - 115, 99, 97, 108, 101, 100, - 0, 120, 101, 95, 101, 100, - 114, 97, 109, 95, 115, 116, - 101, 110, 99, 105, 108, 0, - 1, 0, 19, 0, 1, 0, - 4, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 19, 8, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 114, 116, 95, - 98, 97, 115, 101, 95, 100, - 119, 111, 114, 100, 115, 95, - 115, 99, 97, 108, 101, 100, 0, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 116, + 101, 120, 116, 117, 114, 101, + 115, 95, 114, 101, 115, 111, + 108, 118, 101, 100, 0, 120, + 101, 95, 97, 108, 112, 104, + 97, 95, 116, 101, 115, 116, + 95, 114, 101, 102, 101, 114, + 101, 110, 99, 101, 0, 120, + 101, 95, 97, 108, 112, 104, + 97, 95, 116, 111, 95, 109, + 97, 115, 107, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 51, 50, 98, 112, 112, + 95, 116, 105, 108, 101, 95, + 112, 105, 116, 99, 104, 95, + 100, 119, 111, 114, 100, 115, + 95, 115, 99, 97, 108, 101, + 100, 0, 120, 101, 95, 99, + 111, 108, 111, 114, 95, 101, + 120, 112, 95, 98, 105, 97, + 115, 0, 1, 0, 3, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 8, + 0, 0, 0, 0, 172, 6, 0, 0, 120, 101, 95, 101, - 100, 114, 97, 109, 95, 114, - 116, 95, 102, 111, 114, 109, - 97, 116, 95, 102, 108, 97, - 103, 115, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 114, 116, 95, 99, 108, 97, - 109, 112, 0, 171, 1, 0, - 3, 0, 1, 0, 4, 0, - 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 172, 6, 0, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 107, 101, - 101, 112, 95, 109, 97, 115, - 107, 0, 171, 171, 1, 0, + 100, 114, 97, 109, 95, 112, + 111, 108, 121, 95, 111, 102, + 102, 115, 101, 116, 95, 102, + 114, 111, 110, 116, 0, 120, + 101, 95, 101, 100, 114, 97, + 109, 95, 112, 111, 108, 121, + 95, 111, 102, 102, 115, 101, + 116, 95, 98, 97, 99, 107, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 100, 101, + 112, 116, 104, 95, 98, 97, + 115, 101, 95, 100, 119, 111, + 114, 100, 115, 95, 115, 99, + 97, 108, 101, 100, 0, 120, + 101, 95, 101, 100, 114, 97, + 109, 95, 115, 116, 101, 110, + 99, 105, 108, 0, 1, 0, 19, 0, 1, 0, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, + 37, 8, 0, 0, 120, 101, 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 98, 108, - 101, 110, 100, 95, 102, 97, - 99, 116, 111, 114, 115, 95, - 111, 112, 115, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 98, 108, 101, 110, 100, - 95, 99, 111, 110, 115, 116, - 97, 110, 116, 0, 77, 105, - 99, 114, 111, 115, 111, 102, - 116, 32, 40, 82, 41, 32, - 72, 76, 83, 76, 32, 83, - 104, 97, 100, 101, 114, 32, - 67, 111, 109, 112, 105, 108, - 101, 114, 32, 49, 48, 46, - 49, 0, 171, 171, 73, 83, - 71, 78, 44, 0, 0, 0, - 1, 0, 0, 0, 8, 0, - 0, 0, 32, 0, 0, 0, + 95, 114, 116, 95, 98, 97, + 115, 101, 95, 100, 119, 111, + 114, 100, 115, 95, 115, 99, + 97, 108, 101, 100, 0, 171, + 1, 0, 19, 0, 1, 0, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 1, 1, - 0, 0, 88, 69, 86, 69, - 82, 84, 69, 88, 73, 68, - 0, 171, 79, 83, 71, 78, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 37, 8, 0, 0, + 120, 101, 95, 101, 100, 114, + 97, 109, 95, 114, 116, 95, + 102, 111, 114, 109, 97, 116, + 95, 102, 108, 97, 103, 115, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 114, 116, + 95, 99, 108, 97, 109, 112, + 0, 171, 1, 0, 3, 0, + 1, 0, 4, 0, 4, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 172, 6, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 107, 101, 101, 112, + 95, 109, 97, 115, 107, 0, + 171, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 98, 108, 101, 110, + 100, 95, 102, 97, 99, 116, + 111, 114, 115, 95, 111, 112, + 115, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 98, + 108, 101, 110, 100, 95, 99, + 111, 110, 115, 116, 97, 110, + 116, 0, 77, 105, 99, 114, + 111, 115, 111, 102, 116, 32, + 40, 82, 41, 32, 72, 76, + 83, 76, 32, 83, 104, 97, + 100, 101, 114, 32, 67, 111, + 109, 112, 105, 108, 101, 114, + 32, 49, 48, 46, 49, 0, + 171, 171, 73, 83, 71, 78, 44, 0, 0, 0, 1, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 1, 14, 0, 0, + 0, 0, 1, 1, 0, 0, 88, 69, 86, 69, 82, 84, 69, 88, 73, 68, 0, 171, - 80, 67, 83, 71, 140, 0, - 0, 0, 4, 0, 0, 0, - 8, 0, 0, 0, 104, 0, - 0, 0, 0, 0, 0, 0, - 13, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, - 1, 14, 0, 0, 104, 0, + 79, 83, 71, 78, 44, 0, 0, 0, 1, 0, 0, 0, - 13, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, - 1, 14, 0, 0, 104, 0, - 0, 0, 2, 0, 0, 0, - 13, 0, 0, 0, 3, 0, - 0, 0, 2, 0, 0, 0, - 1, 14, 0, 0, 118, 0, + 8, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 14, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 1, 14, 0, 0, 88, 69, + 86, 69, 82, 84, 69, 88, + 73, 68, 0, 171, 80, 67, + 83, 71, 140, 0, 0, 0, + 4, 0, 0, 0, 8, 0, + 0, 0, 104, 0, 0, 0, + 0, 0, 0, 0, 13, 0, 0, 0, 3, 0, 0, 0, - 1, 14, 0, 0, 83, 86, - 95, 84, 101, 115, 115, 70, + 0, 0, 0, 0, 1, 14, + 0, 0, 104, 0, 0, 0, + 1, 0, 0, 0, 13, 0, + 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 1, 14, + 0, 0, 104, 0, 0, 0, + 2, 0, 0, 0, 13, 0, + 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 1, 14, + 0, 0, 118, 0, 0, 0, + 0, 0, 0, 0, 14, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 1, 14, + 0, 0, 83, 86, 95, 84, + 101, 115, 115, 70, 97, 99, + 116, 111, 114, 0, 83, 86, + 95, 73, 110, 115, 105, 100, + 101, 84, 101, 115, 115, 70, 97, 99, 116, 111, 114, 0, - 83, 86, 95, 73, 110, 115, - 105, 100, 101, 84, 101, 115, - 115, 70, 97, 99, 116, 111, - 114, 0, 171, 171, 83, 72, - 69, 88, 4, 1, 0, 0, - 81, 0, 3, 0, 65, 0, - 0, 0, 113, 0, 0, 1, - 147, 24, 0, 1, 148, 24, - 0, 1, 149, 16, 0, 1, - 150, 32, 0, 1, 151, 24, - 0, 1, 106, 8, 0, 1, - 89, 0, 0, 7, 70, 142, - 48, 0, 0, 0, 0, 0, + 171, 171, 83, 72, 69, 88, + 4, 1, 0, 0, 81, 0, + 3, 0, 65, 0, 0, 0, + 113, 0, 0, 1, 147, 24, + 0, 1, 148, 24, 0, 1, + 149, 16, 0, 1, 150, 32, + 0, 1, 151, 24, 0, 1, + 106, 8, 0, 1, 89, 0, + 0, 7, 70, 142, 48, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 115, 0, - 0, 1, 153, 0, 0, 2, - 3, 0, 0, 0, 95, 0, - 0, 2, 0, 112, 1, 0, - 103, 0, 0, 4, 18, 32, - 16, 0, 0, 0, 0, 0, - 17, 0, 0, 0, 103, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 115, 0, 0, 1, + 153, 0, 0, 2, 3, 0, + 0, 0, 95, 0, 0, 2, + 0, 112, 1, 0, 103, 0, 0, 4, 18, 32, 16, 0, - 1, 0, 0, 0, 18, 0, + 0, 0, 0, 0, 17, 0, 0, 0, 103, 0, 0, 4, - 18, 32, 16, 0, 2, 0, - 0, 0, 19, 0, 0, 0, - 104, 0, 0, 2, 1, 0, - 0, 0, 91, 0, 0, 4, - 18, 32, 16, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 54, 0, 0, 4, 18, 0, + 18, 32, 16, 0, 1, 0, + 0, 0, 18, 0, 0, 0, + 103, 0, 0, 4, 18, 32, + 16, 0, 2, 0, 0, 0, + 19, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, + 91, 0, 0, 4, 18, 32, + 16, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 54, 0, + 0, 4, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 112, + 1, 0, 54, 0, 0, 8, + 18, 32, 144, 0, 10, 0, 16, 0, 0, 0, 0, 0, - 10, 112, 1, 0, 54, 0, - 0, 8, 18, 32, 144, 0, - 10, 0, 16, 0, 0, 0, - 0, 0, 42, 128, 48, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 62, 0, 0, 1, 115, 0, - 0, 1, 103, 0, 0, 4, - 18, 32, 16, 0, 3, 0, - 0, 0, 20, 0, 0, 0, - 54, 0, 0, 7, 18, 32, - 16, 0, 3, 0, 0, 0, 42, 128, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, - 0, 1, 83, 84, 65, 84, - 148, 0, 0, 0, 5, 0, - 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 4, 0, + 0, 1, 115, 0, 0, 1, + 103, 0, 0, 4, 18, 32, + 16, 0, 3, 0, 0, 0, + 20, 0, 0, 0, 54, 0, + 0, 7, 18, 32, 16, 0, + 3, 0, 0, 0, 42, 128, + 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 148, 0, + 0, 0, 5, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 10, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 4, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 10, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 3, 0, 0, 0, - 4, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0 + 0, 0, 0, 0, 0, 0 }; diff --git a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/discrete_quad_hs.h b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/discrete_quad_hs.h index 4a5b81c9c..dfc49e9d2 100644 --- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/discrete_quad_hs.h +++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/discrete_quad_hs.h @@ -19,8 +19,8 @@ // float xe_point_vertex_diameter_min;// Offset: 140 Size: 4 [unused] // float3 xe_ndc_offset; // Offset: 144 Size: 12 [unused] // float xe_point_vertex_diameter_max;// Offset: 156 Size: 4 [unused] -// float2 xe_point_constant_radius; // Offset: 160 Size: 8 [unused] -// float2 xe_point_screen_to_ndc; // Offset: 168 Size: 8 [unused] +// float2 xe_point_constant_diameter; // Offset: 160 Size: 8 [unused] +// float2 xe_point_screen_diameter_to_ndc_radius;// Offset: 168 Size: 8 [unused] // uint xe_interpolator_sampling_pattern;// Offset: 176 Size: 4 [unused] // uint xe_ps_param_gen; // Offset: 180 Size: 4 [unused] // uint2 xe_sample_count_log2; // Offset: 184 Size: 8 [unused] @@ -121,21 +121,21 @@ ret const BYTE discrete_quad_hs[] = { - 68, 88, 66, 67, 228, 206, - 50, 86, 18, 2, 56, 90, - 135, 194, 252, 60, 37, 181, - 95, 80, 1, 0, 0, 0, - 12, 14, 0, 0, 6, 0, + 68, 88, 66, 67, 12, 3, + 52, 62, 60, 171, 174, 248, + 249, 81, 162, 162, 255, 59, + 137, 143, 1, 0, 0, 0, + 28, 14, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, - 216, 10, 0, 0, 12, 11, - 0, 0, 64, 11, 0, 0, - 4, 12, 0, 0, 112, 13, + 232, 10, 0, 0, 28, 11, + 0, 0, 80, 11, 0, 0, + 20, 12, 0, 0, 128, 13, 0, 0, 82, 68, 69, 70, - 152, 10, 0, 0, 1, 0, + 168, 10, 0, 0, 1, 0, 0, 0, 120, 0, 0, 0, 1, 0, 0, 0, 60, 0, 0, 0, 1, 5, 83, 72, - 0, 5, 0, 0, 110, 10, + 0, 5, 0, 0, 126, 10, 0, 0, 19, 19, 68, 37, 60, 0, 0, 0, 24, 0, 0, 0, 40, 0, 0, 0, @@ -235,137 +235,137 @@ const BYTE discrete_quad_hs[] = 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 156, 7, + 0, 0, 0, 0, 158, 7, 0, 0, 168, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 179, 7, 0, 0, + 0, 0, 197, 7, 0, 0, 176, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 212, 7, 0, 0, 180, 0, + 230, 7, 0, 0, 180, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 228, 7, + 0, 0, 0, 0, 246, 7, 0, 0, 184, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 116, 6, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 249, 7, 0, 0, + 0, 0, 11, 8, 0, 0, 192, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 28, 8, 0, 0, 0, 0, + 44, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 64, 8, 0, 0, 224, 0, + 80, 8, 0, 0, 224, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 85, 8, + 0, 0, 0, 0, 101, 8, 0, 0, 228, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 52, 7, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 109, 8, 0, 0, + 0, 0, 125, 8, 0, 0, 232, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 126, 8, 0, 0, 236, 0, + 142, 8, 0, 0, 236, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 166, 8, + 0, 0, 0, 0, 182, 8, 0, 0, 240, 0, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 184, 8, 0, 0, + 0, 0, 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 220, 8, 0, 0, + 0, 0, 236, 8, 0, 0, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 247, 8, 0, 0, 8, 1, + 7, 9, 0, 0, 8, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 17, 9, + 0, 0, 0, 0, 33, 9, 0, 0, 16, 1, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 51, 9, 0, 0, + 0, 0, 67, 9, 0, 0, 32, 1, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 68, 9, 0, 0, 0, 0, + 84, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 104, 9, 0, 0, 64, 1, + 120, 9, 0, 0, 64, 1, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 136, 9, + 0, 0, 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 172, 9, + 0, 0, 0, 0, 188, 9, 0, 0, 80, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 136, 9, 0, 0, + 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 197, 9, 0, 0, + 0, 0, 213, 9, 0, 0, 96, 1, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, - 216, 9, 0, 0, 0, 0, + 232, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 252, 9, 0, 0, 160, 1, + 12, 10, 0, 0, 160, 1, 0, 0, 32, 0, 0, 0, - 0, 0, 0, 0, 20, 10, + 0, 0, 0, 0, 36, 10, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 56, 10, + 0, 0, 0, 0, 72, 10, 0, 0, 192, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 136, 9, 0, 0, + 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 86, 10, 0, 0, + 0, 0, 102, 10, 0, 0, 208, 1, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 184, 8, 0, 0, 0, 0, + 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, @@ -455,11 +455,14 @@ const BYTE discrete_quad_hs[] = 0, 120, 101, 95, 112, 111, 105, 110, 116, 95, 99, 111, 110, 115, 116, 97, 110, 116, - 95, 114, 97, 100, 105, 117, - 115, 0, 120, 101, 95, 112, - 111, 105, 110, 116, 95, 115, - 99, 114, 101, 101, 110, 95, - 116, 111, 95, 110, 100, 99, + 95, 100, 105, 97, 109, 101, + 116, 101, 114, 0, 120, 101, + 95, 112, 111, 105, 110, 116, + 95, 115, 99, 114, 101, 101, + 110, 95, 100, 105, 97, 109, + 101, 116, 101, 114, 95, 116, + 111, 95, 110, 100, 99, 95, + 114, 97, 100, 105, 117, 115, 0, 120, 101, 95, 105, 110, 116, 101, 114, 112, 111, 108, 97, 116, 111, 114, 95, 115, @@ -477,230 +480,230 @@ const BYTE discrete_quad_hs[] = 105, 122, 122, 108, 101, 100, 95, 115, 105, 103, 110, 115, 0, 117, 105, 110, 116, 52, - 0, 171, 171, 171, 1, 0, - 19, 0, 1, 0, 4, 0, - 2, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, - 95, 116, 101, 120, 116, 117, - 114, 101, 115, 95, 114, 101, - 115, 111, 108, 118, 101, 100, - 0, 120, 101, 95, 97, 108, - 112, 104, 97, 95, 116, 101, - 115, 116, 95, 114, 101, 102, - 101, 114, 101, 110, 99, 101, - 0, 120, 101, 95, 97, 108, - 112, 104, 97, 95, 116, 111, - 95, 109, 97, 115, 107, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 51, 50, 98, - 112, 112, 95, 116, 105, 108, - 101, 95, 112, 105, 116, 99, - 104, 95, 100, 119, 111, 114, - 100, 115, 95, 115, 99, 97, - 108, 101, 100, 0, 120, 101, - 95, 99, 111, 108, 111, 114, - 95, 101, 120, 112, 95, 98, - 105, 97, 115, 0, 1, 0, - 3, 0, 1, 0, 4, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 172, 6, 0, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 112, 111, 108, 121, 95, - 111, 102, 102, 115, 101, 116, - 95, 102, 114, 111, 110, 116, - 0, 120, 101, 95, 101, 100, - 114, 97, 109, 95, 112, 111, - 108, 121, 95, 111, 102, 102, - 115, 101, 116, 95, 98, 97, - 99, 107, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 100, 101, 112, 116, 104, 95, - 98, 97, 115, 101, 95, 100, - 119, 111, 114, 100, 115, 95, - 115, 99, 97, 108, 101, 100, - 0, 120, 101, 95, 101, 100, - 114, 97, 109, 95, 115, 116, - 101, 110, 99, 105, 108, 0, - 1, 0, 19, 0, 1, 0, - 4, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 19, 8, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 114, 116, 95, - 98, 97, 115, 101, 95, 100, - 119, 111, 114, 100, 115, 95, - 115, 99, 97, 108, 101, 100, 0, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 116, + 101, 120, 116, 117, 114, 101, + 115, 95, 114, 101, 115, 111, + 108, 118, 101, 100, 0, 120, + 101, 95, 97, 108, 112, 104, + 97, 95, 116, 101, 115, 116, + 95, 114, 101, 102, 101, 114, + 101, 110, 99, 101, 0, 120, + 101, 95, 97, 108, 112, 104, + 97, 95, 116, 111, 95, 109, + 97, 115, 107, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 51, 50, 98, 112, 112, + 95, 116, 105, 108, 101, 95, + 112, 105, 116, 99, 104, 95, + 100, 119, 111, 114, 100, 115, + 95, 115, 99, 97, 108, 101, + 100, 0, 120, 101, 95, 99, + 111, 108, 111, 114, 95, 101, + 120, 112, 95, 98, 105, 97, + 115, 0, 1, 0, 3, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 8, + 0, 0, 0, 0, 172, 6, 0, 0, 120, 101, 95, 101, - 100, 114, 97, 109, 95, 114, - 116, 95, 102, 111, 114, 109, - 97, 116, 95, 102, 108, 97, - 103, 115, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 114, 116, 95, 99, 108, 97, - 109, 112, 0, 171, 1, 0, - 3, 0, 1, 0, 4, 0, - 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 172, 6, 0, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 107, 101, - 101, 112, 95, 109, 97, 115, - 107, 0, 171, 171, 1, 0, + 100, 114, 97, 109, 95, 112, + 111, 108, 121, 95, 111, 102, + 102, 115, 101, 116, 95, 102, + 114, 111, 110, 116, 0, 120, + 101, 95, 101, 100, 114, 97, + 109, 95, 112, 111, 108, 121, + 95, 111, 102, 102, 115, 101, + 116, 95, 98, 97, 99, 107, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 100, 101, + 112, 116, 104, 95, 98, 97, + 115, 101, 95, 100, 119, 111, + 114, 100, 115, 95, 115, 99, + 97, 108, 101, 100, 0, 120, + 101, 95, 101, 100, 114, 97, + 109, 95, 115, 116, 101, 110, + 99, 105, 108, 0, 1, 0, 19, 0, 1, 0, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, + 37, 8, 0, 0, 120, 101, 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 98, 108, - 101, 110, 100, 95, 102, 97, - 99, 116, 111, 114, 115, 95, - 111, 112, 115, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 98, 108, 101, 110, 100, - 95, 99, 111, 110, 115, 116, - 97, 110, 116, 0, 77, 105, - 99, 114, 111, 115, 111, 102, - 116, 32, 40, 82, 41, 32, - 72, 76, 83, 76, 32, 83, - 104, 97, 100, 101, 114, 32, - 67, 111, 109, 112, 105, 108, - 101, 114, 32, 49, 48, 46, - 49, 0, 171, 171, 73, 83, - 71, 78, 44, 0, 0, 0, - 1, 0, 0, 0, 8, 0, - 0, 0, 32, 0, 0, 0, + 95, 114, 116, 95, 98, 97, + 115, 101, 95, 100, 119, 111, + 114, 100, 115, 95, 115, 99, + 97, 108, 101, 100, 0, 171, + 1, 0, 19, 0, 1, 0, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 1, 1, - 0, 0, 88, 69, 86, 69, - 82, 84, 69, 88, 73, 68, - 0, 171, 79, 83, 71, 78, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 37, 8, 0, 0, + 120, 101, 95, 101, 100, 114, + 97, 109, 95, 114, 116, 95, + 102, 111, 114, 109, 97, 116, + 95, 102, 108, 97, 103, 115, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 114, 116, + 95, 99, 108, 97, 109, 112, + 0, 171, 1, 0, 3, 0, + 1, 0, 4, 0, 4, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 172, 6, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 107, 101, 101, 112, + 95, 109, 97, 115, 107, 0, + 171, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 98, 108, 101, 110, + 100, 95, 102, 97, 99, 116, + 111, 114, 115, 95, 111, 112, + 115, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 98, + 108, 101, 110, 100, 95, 99, + 111, 110, 115, 116, 97, 110, + 116, 0, 77, 105, 99, 114, + 111, 115, 111, 102, 116, 32, + 40, 82, 41, 32, 72, 76, + 83, 76, 32, 83, 104, 97, + 100, 101, 114, 32, 67, 111, + 109, 112, 105, 108, 101, 114, + 32, 49, 48, 46, 49, 0, + 171, 171, 73, 83, 71, 78, 44, 0, 0, 0, 1, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 1, 14, 0, 0, + 0, 0, 1, 1, 0, 0, 88, 69, 86, 69, 82, 84, 69, 88, 73, 68, 0, 171, - 80, 67, 83, 71, 188, 0, - 0, 0, 6, 0, 0, 0, - 8, 0, 0, 0, 152, 0, - 0, 0, 0, 0, 0, 0, - 11, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, - 1, 14, 0, 0, 152, 0, + 79, 83, 71, 78, 44, 0, 0, 0, 1, 0, 0, 0, - 11, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, - 1, 14, 0, 0, 152, 0, - 0, 0, 2, 0, 0, 0, - 11, 0, 0, 0, 3, 0, - 0, 0, 2, 0, 0, 0, - 1, 14, 0, 0, 152, 0, + 8, 0, 0, 0, 32, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 1, 14, 0, 0, 88, 69, + 86, 69, 82, 84, 69, 88, + 73, 68, 0, 171, 80, 67, + 83, 71, 188, 0, 0, 0, + 6, 0, 0, 0, 8, 0, + 0, 0, 152, 0, 0, 0, + 0, 0, 0, 0, 11, 0, 0, 0, 3, 0, 0, 0, - 11, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 1, 14, + 0, 0, 152, 0, 0, 0, + 1, 0, 0, 0, 11, 0, 0, 0, 3, 0, 0, 0, - 1, 14, 0, 0, 166, 0, - 0, 0, 0, 0, 0, 0, - 12, 0, 0, 0, 3, 0, - 0, 0, 4, 0, 0, 0, - 1, 14, 0, 0, 166, 0, - 0, 0, 1, 0, 0, 0, - 12, 0, 0, 0, 3, 0, - 0, 0, 5, 0, 0, 0, - 1, 14, 0, 0, 83, 86, - 95, 84, 101, 115, 115, 70, - 97, 99, 116, 111, 114, 0, - 83, 86, 95, 73, 110, 115, - 105, 100, 101, 84, 101, 115, - 115, 70, 97, 99, 116, 111, - 114, 0, 171, 171, 83, 72, - 69, 88, 100, 1, 0, 0, - 81, 0, 3, 0, 89, 0, - 0, 0, 113, 0, 0, 1, - 147, 32, 0, 1, 148, 32, - 0, 1, 149, 24, 0, 1, - 150, 8, 0, 1, 151, 24, - 0, 1, 106, 8, 0, 1, - 89, 0, 0, 7, 70, 142, - 48, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 115, 0, - 0, 1, 153, 0, 0, 2, - 4, 0, 0, 0, 95, 0, - 0, 2, 0, 112, 1, 0, - 103, 0, 0, 4, 18, 32, - 16, 0, 0, 0, 0, 0, - 11, 0, 0, 0, 103, 0, - 0, 4, 18, 32, 16, 0, + 1, 0, 0, 0, 1, 14, + 0, 0, 152, 0, 0, 0, + 2, 0, 0, 0, 11, 0, + 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 1, 14, + 0, 0, 152, 0, 0, 0, + 3, 0, 0, 0, 11, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 1, 14, + 0, 0, 166, 0, 0, 0, + 0, 0, 0, 0, 12, 0, + 0, 0, 3, 0, 0, 0, + 4, 0, 0, 0, 1, 14, + 0, 0, 166, 0, 0, 0, 1, 0, 0, 0, 12, 0, - 0, 0, 103, 0, 0, 4, - 18, 32, 16, 0, 2, 0, - 0, 0, 13, 0, 0, 0, - 103, 0, 0, 4, 18, 32, - 16, 0, 3, 0, 0, 0, - 14, 0, 0, 0, 104, 0, - 0, 2, 1, 0, 0, 0, - 91, 0, 0, 4, 18, 32, - 16, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 54, 0, - 0, 4, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 112, - 1, 0, 54, 0, 0, 8, - 18, 32, 144, 0, 10, 0, - 16, 0, 0, 0, 0, 0, - 42, 128, 48, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 5, 0, 0, 0, 1, 14, + 0, 0, 83, 86, 95, 84, + 101, 115, 115, 70, 97, 99, + 116, 111, 114, 0, 83, 86, + 95, 73, 110, 115, 105, 100, + 101, 84, 101, 115, 115, 70, + 97, 99, 116, 111, 114, 0, + 171, 171, 83, 72, 69, 88, + 100, 1, 0, 0, 81, 0, + 3, 0, 89, 0, 0, 0, + 113, 0, 0, 1, 147, 32, + 0, 1, 148, 32, 0, 1, + 149, 24, 0, 1, 150, 8, + 0, 1, 151, 24, 0, 1, + 106, 8, 0, 1, 89, 0, + 0, 7, 70, 142, 48, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 62, 0, - 0, 1, 115, 0, 0, 1, - 153, 0, 0, 2, 2, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 115, 0, 0, 1, + 153, 0, 0, 2, 4, 0, 0, 0, 95, 0, 0, 2, 0, 112, 1, 0, 103, 0, 0, 4, 18, 32, 16, 0, - 4, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 11, 0, 0, 0, 103, 0, 0, 4, - 18, 32, 16, 0, 5, 0, - 0, 0, 16, 0, 0, 0, - 104, 0, 0, 2, 1, 0, - 0, 0, 91, 0, 0, 4, + 18, 32, 16, 0, 1, 0, + 0, 0, 12, 0, 0, 0, + 103, 0, 0, 4, 18, 32, + 16, 0, 2, 0, 0, 0, + 13, 0, 0, 0, 103, 0, + 0, 4, 18, 32, 16, 0, + 3, 0, 0, 0, 14, 0, + 0, 0, 104, 0, 0, 2, + 1, 0, 0, 0, 91, 0, + 0, 4, 18, 32, 16, 0, + 0, 0, 0, 0, 4, 0, + 0, 0, 54, 0, 0, 4, + 18, 0, 16, 0, 0, 0, + 0, 0, 10, 112, 1, 0, + 54, 0, 0, 8, 18, 32, + 144, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 42, 128, + 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 115, 0, 0, 1, 153, 0, + 0, 2, 2, 0, 0, 0, + 95, 0, 0, 2, 0, 112, + 1, 0, 103, 0, 0, 4, 18, 32, 16, 0, 4, 0, - 0, 0, 2, 0, 0, 0, - 54, 0, 0, 4, 18, 0, - 16, 0, 0, 0, 0, 0, - 10, 112, 1, 0, 54, 0, - 0, 9, 18, 32, 208, 0, - 4, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, - 42, 128, 48, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 103, 0, 0, 4, 18, 32, + 16, 0, 5, 0, 0, 0, + 16, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, + 91, 0, 0, 4, 18, 32, + 16, 0, 4, 0, 0, 0, + 2, 0, 0, 0, 54, 0, + 0, 4, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 112, + 1, 0, 54, 0, 0, 9, + 18, 32, 208, 0, 4, 0, + 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 42, 128, + 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 62, 0, - 0, 1, 83, 84, 65, 84, - 148, 0, 0, 0, 6, 0, - 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 5, 0, + 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 148, 0, + 0, 0, 6, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 0, + 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -708,17 +711,16 @@ const BYTE discrete_quad_hs[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 11, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 11, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 4, 0, + 3, 0, 0, 0, 1, 0, 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0 + 0, 0, 0, 0, 0, 0 }; diff --git a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/discrete_triangle_hs.h b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/discrete_triangle_hs.h index 39b97f602..a386d836a 100644 --- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/discrete_triangle_hs.h +++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/discrete_triangle_hs.h @@ -19,8 +19,8 @@ // float xe_point_vertex_diameter_min;// Offset: 140 Size: 4 [unused] // float3 xe_ndc_offset; // Offset: 144 Size: 12 [unused] // float xe_point_vertex_diameter_max;// Offset: 156 Size: 4 [unused] -// float2 xe_point_constant_radius; // Offset: 160 Size: 8 [unused] -// float2 xe_point_screen_to_ndc; // Offset: 168 Size: 8 [unused] +// float2 xe_point_constant_diameter; // Offset: 160 Size: 8 [unused] +// float2 xe_point_screen_diameter_to_ndc_radius;// Offset: 168 Size: 8 [unused] // uint xe_interpolator_sampling_pattern;// Offset: 176 Size: 4 [unused] // uint xe_ps_param_gen; // Offset: 180 Size: 4 [unused] // uint2 xe_sample_count_log2; // Offset: 184 Size: 8 [unused] @@ -112,21 +112,21 @@ ret const BYTE discrete_triangle_hs[] = { - 68, 88, 66, 67, 148, 187, - 8, 94, 203, 120, 121, 120, - 126, 74, 170, 83, 209, 21, - 43, 73, 1, 0, 0, 0, - 124, 13, 0, 0, 6, 0, + 68, 88, 66, 67, 242, 103, + 49, 84, 105, 84, 128, 131, + 50, 149, 249, 84, 224, 173, + 77, 78, 1, 0, 0, 0, + 140, 13, 0, 0, 6, 0, 0, 0, 56, 0, 0, 0, - 216, 10, 0, 0, 12, 11, - 0, 0, 64, 11, 0, 0, - 212, 11, 0, 0, 224, 12, + 232, 10, 0, 0, 28, 11, + 0, 0, 80, 11, 0, 0, + 228, 11, 0, 0, 240, 12, 0, 0, 82, 68, 69, 70, - 152, 10, 0, 0, 1, 0, + 168, 10, 0, 0, 1, 0, 0, 0, 120, 0, 0, 0, 1, 0, 0, 0, 60, 0, 0, 0, 1, 5, 83, 72, - 0, 5, 0, 0, 110, 10, + 0, 5, 0, 0, 126, 10, 0, 0, 19, 19, 68, 37, 60, 0, 0, 0, 24, 0, 0, 0, 40, 0, 0, 0, @@ -226,137 +226,137 @@ const BYTE discrete_triangle_hs[] = 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 156, 7, + 0, 0, 0, 0, 158, 7, 0, 0, 168, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 179, 7, 0, 0, + 0, 0, 197, 7, 0, 0, 176, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 212, 7, 0, 0, 180, 0, + 230, 7, 0, 0, 180, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 228, 7, + 0, 0, 0, 0, 246, 7, 0, 0, 184, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 116, 6, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 249, 7, 0, 0, + 0, 0, 11, 8, 0, 0, 192, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 28, 8, 0, 0, 0, 0, + 44, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 64, 8, 0, 0, 224, 0, + 80, 8, 0, 0, 224, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 85, 8, + 0, 0, 0, 0, 101, 8, 0, 0, 228, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 52, 7, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 109, 8, 0, 0, + 0, 0, 125, 8, 0, 0, 232, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 126, 8, 0, 0, 236, 0, + 142, 8, 0, 0, 236, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 166, 8, + 0, 0, 0, 0, 182, 8, 0, 0, 240, 0, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 184, 8, 0, 0, + 0, 0, 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 220, 8, 0, 0, + 0, 0, 236, 8, 0, 0, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 247, 8, 0, 0, 8, 1, + 7, 9, 0, 0, 8, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 17, 9, + 0, 0, 0, 0, 33, 9, 0, 0, 16, 1, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 51, 9, 0, 0, + 0, 0, 67, 9, 0, 0, 32, 1, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 68, 9, 0, 0, 0, 0, + 84, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 104, 9, 0, 0, 64, 1, + 120, 9, 0, 0, 64, 1, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 136, 9, + 0, 0, 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 172, 9, + 0, 0, 0, 0, 188, 9, 0, 0, 80, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 136, 9, 0, 0, + 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 197, 9, 0, 0, + 0, 0, 213, 9, 0, 0, 96, 1, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, - 216, 9, 0, 0, 0, 0, + 232, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 252, 9, 0, 0, 160, 1, + 12, 10, 0, 0, 160, 1, 0, 0, 32, 0, 0, 0, - 0, 0, 0, 0, 20, 10, + 0, 0, 0, 0, 36, 10, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 56, 10, + 0, 0, 0, 0, 72, 10, 0, 0, 192, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 136, 9, 0, 0, + 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 86, 10, 0, 0, + 0, 0, 102, 10, 0, 0, 208, 1, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 184, 8, 0, 0, 0, 0, + 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, @@ -446,11 +446,14 @@ const BYTE discrete_triangle_hs[] = 0, 120, 101, 95, 112, 111, 105, 110, 116, 95, 99, 111, 110, 115, 116, 97, 110, 116, - 95, 114, 97, 100, 105, 117, - 115, 0, 120, 101, 95, 112, - 111, 105, 110, 116, 95, 115, - 99, 114, 101, 101, 110, 95, - 116, 111, 95, 110, 100, 99, + 95, 100, 105, 97, 109, 101, + 116, 101, 114, 0, 120, 101, + 95, 112, 111, 105, 110, 116, + 95, 115, 99, 114, 101, 101, + 110, 95, 100, 105, 97, 109, + 101, 116, 101, 114, 95, 116, + 111, 95, 110, 100, 99, 95, + 114, 97, 100, 105, 117, 115, 0, 120, 101, 95, 105, 110, 116, 101, 114, 112, 111, 108, 97, 116, 111, 114, 95, 115, @@ -468,224 +471,223 @@ const BYTE discrete_triangle_hs[] = 105, 122, 122, 108, 101, 100, 95, 115, 105, 103, 110, 115, 0, 117, 105, 110, 116, 52, - 0, 171, 171, 171, 1, 0, - 19, 0, 1, 0, 4, 0, - 2, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, - 95, 116, 101, 120, 116, 117, - 114, 101, 115, 95, 114, 101, - 115, 111, 108, 118, 101, 100, - 0, 120, 101, 95, 97, 108, - 112, 104, 97, 95, 116, 101, - 115, 116, 95, 114, 101, 102, - 101, 114, 101, 110, 99, 101, - 0, 120, 101, 95, 97, 108, - 112, 104, 97, 95, 116, 111, - 95, 109, 97, 115, 107, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 51, 50, 98, - 112, 112, 95, 116, 105, 108, - 101, 95, 112, 105, 116, 99, - 104, 95, 100, 119, 111, 114, - 100, 115, 95, 115, 99, 97, - 108, 101, 100, 0, 120, 101, - 95, 99, 111, 108, 111, 114, - 95, 101, 120, 112, 95, 98, - 105, 97, 115, 0, 1, 0, - 3, 0, 1, 0, 4, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 172, 6, 0, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 112, 111, 108, 121, 95, - 111, 102, 102, 115, 101, 116, - 95, 102, 114, 111, 110, 116, - 0, 120, 101, 95, 101, 100, - 114, 97, 109, 95, 112, 111, - 108, 121, 95, 111, 102, 102, - 115, 101, 116, 95, 98, 97, - 99, 107, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 100, 101, 112, 116, 104, 95, - 98, 97, 115, 101, 95, 100, - 119, 111, 114, 100, 115, 95, - 115, 99, 97, 108, 101, 100, - 0, 120, 101, 95, 101, 100, - 114, 97, 109, 95, 115, 116, - 101, 110, 99, 105, 108, 0, - 1, 0, 19, 0, 1, 0, - 4, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 19, 8, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 114, 116, 95, - 98, 97, 115, 101, 95, 100, - 119, 111, 114, 100, 115, 95, - 115, 99, 97, 108, 101, 100, 0, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 116, + 101, 120, 116, 117, 114, 101, + 115, 95, 114, 101, 115, 111, + 108, 118, 101, 100, 0, 120, + 101, 95, 97, 108, 112, 104, + 97, 95, 116, 101, 115, 116, + 95, 114, 101, 102, 101, 114, + 101, 110, 99, 101, 0, 120, + 101, 95, 97, 108, 112, 104, + 97, 95, 116, 111, 95, 109, + 97, 115, 107, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 51, 50, 98, 112, 112, + 95, 116, 105, 108, 101, 95, + 112, 105, 116, 99, 104, 95, + 100, 119, 111, 114, 100, 115, + 95, 115, 99, 97, 108, 101, + 100, 0, 120, 101, 95, 99, + 111, 108, 111, 114, 95, 101, + 120, 112, 95, 98, 105, 97, + 115, 0, 1, 0, 3, 0, 1, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 8, + 0, 0, 0, 0, 172, 6, 0, 0, 120, 101, 95, 101, - 100, 114, 97, 109, 95, 114, - 116, 95, 102, 111, 114, 109, - 97, 116, 95, 102, 108, 97, - 103, 115, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 114, 116, 95, 99, 108, 97, - 109, 112, 0, 171, 1, 0, - 3, 0, 1, 0, 4, 0, - 4, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 172, 6, 0, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 107, 101, - 101, 112, 95, 109, 97, 115, - 107, 0, 171, 171, 1, 0, + 100, 114, 97, 109, 95, 112, + 111, 108, 121, 95, 111, 102, + 102, 115, 101, 116, 95, 102, + 114, 111, 110, 116, 0, 120, + 101, 95, 101, 100, 114, 97, + 109, 95, 112, 111, 108, 121, + 95, 111, 102, 102, 115, 101, + 116, 95, 98, 97, 99, 107, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 100, 101, + 112, 116, 104, 95, 98, 97, + 115, 101, 95, 100, 119, 111, + 114, 100, 115, 95, 115, 99, + 97, 108, 101, 100, 0, 120, + 101, 95, 101, 100, 114, 97, + 109, 95, 115, 116, 101, 110, + 99, 105, 108, 0, 1, 0, 19, 0, 1, 0, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, + 37, 8, 0, 0, 120, 101, 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 98, 108, - 101, 110, 100, 95, 102, 97, - 99, 116, 111, 114, 115, 95, - 111, 112, 115, 0, 120, 101, - 95, 101, 100, 114, 97, 109, - 95, 98, 108, 101, 110, 100, - 95, 99, 111, 110, 115, 116, - 97, 110, 116, 0, 77, 105, - 99, 114, 111, 115, 111, 102, - 116, 32, 40, 82, 41, 32, - 72, 76, 83, 76, 32, 83, - 104, 97, 100, 101, 114, 32, - 67, 111, 109, 112, 105, 108, - 101, 114, 32, 49, 48, 46, - 49, 0, 171, 171, 73, 83, - 71, 78, 44, 0, 0, 0, - 1, 0, 0, 0, 8, 0, - 0, 0, 32, 0, 0, 0, + 95, 114, 116, 95, 98, 97, + 115, 101, 95, 100, 119, 111, + 114, 100, 115, 95, 115, 99, + 97, 108, 101, 100, 0, 171, + 1, 0, 19, 0, 1, 0, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 1, 1, - 0, 0, 88, 69, 86, 69, - 82, 84, 69, 88, 73, 68, - 0, 171, 79, 83, 71, 78, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 37, 8, 0, 0, + 120, 101, 95, 101, 100, 114, + 97, 109, 95, 114, 116, 95, + 102, 111, 114, 109, 97, 116, + 95, 102, 108, 97, 103, 115, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 114, 116, + 95, 99, 108, 97, 109, 112, + 0, 171, 1, 0, 3, 0, + 1, 0, 4, 0, 4, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 172, 6, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 107, 101, 101, 112, + 95, 109, 97, 115, 107, 0, + 171, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 98, 108, 101, 110, + 100, 95, 102, 97, 99, 116, + 111, 114, 115, 95, 111, 112, + 115, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 98, + 108, 101, 110, 100, 95, 99, + 111, 110, 115, 116, 97, 110, + 116, 0, 77, 105, 99, 114, + 111, 115, 111, 102, 116, 32, + 40, 82, 41, 32, 72, 76, + 83, 76, 32, 83, 104, 97, + 100, 101, 114, 32, 67, 111, + 109, 112, 105, 108, 101, 114, + 32, 49, 48, 46, 49, 0, + 171, 171, 73, 83, 71, 78, 44, 0, 0, 0, 1, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 1, 14, 0, 0, + 0, 0, 1, 1, 0, 0, 88, 69, 86, 69, 82, 84, 69, 88, 73, 68, 0, 171, - 80, 67, 83, 71, 140, 0, - 0, 0, 4, 0, 0, 0, - 8, 0, 0, 0, 104, 0, - 0, 0, 0, 0, 0, 0, - 13, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, - 1, 14, 0, 0, 104, 0, + 79, 83, 71, 78, 44, 0, 0, 0, 1, 0, 0, 0, - 13, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, - 1, 14, 0, 0, 104, 0, - 0, 0, 2, 0, 0, 0, - 13, 0, 0, 0, 3, 0, - 0, 0, 2, 0, 0, 0, - 1, 14, 0, 0, 118, 0, + 8, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 14, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 1, 14, 0, 0, 88, 69, + 86, 69, 82, 84, 69, 88, + 73, 68, 0, 171, 80, 67, + 83, 71, 140, 0, 0, 0, + 4, 0, 0, 0, 8, 0, + 0, 0, 104, 0, 0, 0, + 0, 0, 0, 0, 13, 0, 0, 0, 3, 0, 0, 0, - 1, 14, 0, 0, 83, 86, - 95, 84, 101, 115, 115, 70, + 0, 0, 0, 0, 1, 14, + 0, 0, 104, 0, 0, 0, + 1, 0, 0, 0, 13, 0, + 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 1, 14, + 0, 0, 104, 0, 0, 0, + 2, 0, 0, 0, 13, 0, + 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 1, 14, + 0, 0, 118, 0, 0, 0, + 0, 0, 0, 0, 14, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 1, 14, + 0, 0, 83, 86, 95, 84, + 101, 115, 115, 70, 97, 99, + 116, 111, 114, 0, 83, 86, + 95, 73, 110, 115, 105, 100, + 101, 84, 101, 115, 115, 70, 97, 99, 116, 111, 114, 0, - 83, 86, 95, 73, 110, 115, - 105, 100, 101, 84, 101, 115, - 115, 70, 97, 99, 116, 111, - 114, 0, 171, 171, 83, 72, - 69, 88, 4, 1, 0, 0, - 81, 0, 3, 0, 65, 0, - 0, 0, 113, 0, 0, 1, - 147, 24, 0, 1, 148, 24, - 0, 1, 149, 16, 0, 1, - 150, 8, 0, 1, 151, 24, - 0, 1, 106, 8, 0, 1, - 89, 0, 0, 7, 70, 142, - 48, 0, 0, 0, 0, 0, + 171, 171, 83, 72, 69, 88, + 4, 1, 0, 0, 81, 0, + 3, 0, 65, 0, 0, 0, + 113, 0, 0, 1, 147, 24, + 0, 1, 148, 24, 0, 1, + 149, 16, 0, 1, 150, 8, + 0, 1, 151, 24, 0, 1, + 106, 8, 0, 1, 89, 0, + 0, 7, 70, 142, 48, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 115, 0, - 0, 1, 153, 0, 0, 2, - 3, 0, 0, 0, 95, 0, - 0, 2, 0, 112, 1, 0, - 103, 0, 0, 4, 18, 32, - 16, 0, 0, 0, 0, 0, - 17, 0, 0, 0, 103, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 115, 0, 0, 1, + 153, 0, 0, 2, 3, 0, + 0, 0, 95, 0, 0, 2, + 0, 112, 1, 0, 103, 0, 0, 4, 18, 32, 16, 0, - 1, 0, 0, 0, 18, 0, + 0, 0, 0, 0, 17, 0, 0, 0, 103, 0, 0, 4, - 18, 32, 16, 0, 2, 0, - 0, 0, 19, 0, 0, 0, - 104, 0, 0, 2, 1, 0, - 0, 0, 91, 0, 0, 4, - 18, 32, 16, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 54, 0, 0, 4, 18, 0, + 18, 32, 16, 0, 1, 0, + 0, 0, 18, 0, 0, 0, + 103, 0, 0, 4, 18, 32, + 16, 0, 2, 0, 0, 0, + 19, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, + 91, 0, 0, 4, 18, 32, + 16, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 54, 0, + 0, 4, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 112, + 1, 0, 54, 0, 0, 8, + 18, 32, 144, 0, 10, 0, 16, 0, 0, 0, 0, 0, - 10, 112, 1, 0, 54, 0, - 0, 8, 18, 32, 144, 0, - 10, 0, 16, 0, 0, 0, - 0, 0, 42, 128, 48, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 62, 0, 0, 1, 115, 0, - 0, 1, 103, 0, 0, 4, - 18, 32, 16, 0, 3, 0, - 0, 0, 20, 0, 0, 0, - 54, 0, 0, 7, 18, 32, - 16, 0, 3, 0, 0, 0, 42, 128, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, - 0, 1, 83, 84, 65, 84, - 148, 0, 0, 0, 5, 0, - 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 4, 0, + 0, 1, 115, 0, 0, 1, + 103, 0, 0, 4, 18, 32, + 16, 0, 3, 0, 0, 0, + 20, 0, 0, 0, 54, 0, + 0, 7, 18, 32, 16, 0, + 3, 0, 0, 0, 42, 128, + 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 148, 0, + 0, 0, 5, 0, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 10, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 10, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0 + 0, 0, 0, 0, 0, 0 }; diff --git a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/primitive_point_list_gs.h b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/primitive_point_list_gs.h index acbcce87d..530c45ecd 100644 --- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/primitive_point_list_gs.h +++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/primitive_point_list_gs.h @@ -19,8 +19,8 @@ // float xe_point_vertex_diameter_min;// Offset: 140 Size: 4 [unused] // float3 xe_ndc_offset; // Offset: 144 Size: 12 [unused] // float xe_point_vertex_diameter_max;// Offset: 156 Size: 4 [unused] -// float2 xe_point_constant_radius; // Offset: 160 Size: 8 -// float2 xe_point_screen_to_ndc; // Offset: 168 Size: 8 +// float2 xe_point_constant_diameter; // Offset: 160 Size: 8 +// float2 xe_point_screen_diameter_to_ndc_radius;// Offset: 168 Size: 8 // uint xe_interpolator_sampling_pattern;// Offset: 176 Size: 4 [unused] // uint xe_ps_param_gen; // Offset: 180 Size: 4 [unused] // uint2 xe_sample_count_log2; // Offset: 184 Size: 8 [unused] @@ -162,11 +162,7 @@ if_nz r0.x ret endif ge [precise(x)] r0.x, v[0][16].z, l(0.000000) -if_nz r0.x - mul [precise(xy)] r0.xy, l(0.500000, 0.500000, 0.000000, 0.000000), v[0][16].zzzz -else - mov [precise(xy)] r0.xy, CB0[0][10].xyxx -endif +movc [precise(xy)] r0.xy, r0.xxxx, v[0][16].zzzz, CB0[0][10].xyxx lt [precise(zw)] r0.zw, l(0.000000, 0.000000, 0.000000, 0.000000), r0.xxxy and [precise(z)] r0.z, r0.w, r0.z if_z r0.z @@ -274,26 +270,26 @@ mov o19.xy, v[0][19].xyxx emit_stream m0 cut_stream m0 ret -// Approximately 121 instruction slots used +// Approximately 117 instruction slots used #endif const BYTE primitive_point_list_gs[] = { - 68, 88, 66, 67, 193, 245, - 77, 40, 213, 43, 129, 142, - 106, 187, 17, 173, 235, 7, - 183, 6, 1, 0, 0, 0, - 176, 29, 0, 0, 5, 0, + 68, 88, 66, 67, 189, 205, + 170, 40, 149, 167, 183, 76, + 207, 160, 219, 147, 216, 124, + 203, 93, 1, 0, 0, 0, + 148, 29, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, - 212, 10, 0, 0, 20, 13, - 0, 0, 124, 15, 0, 0, - 20, 29, 0, 0, 82, 68, - 69, 70, 152, 10, 0, 0, + 228, 10, 0, 0, 36, 13, + 0, 0, 140, 15, 0, 0, + 248, 28, 0, 0, 82, 68, + 69, 70, 168, 10, 0, 0, 1, 0, 0, 0, 120, 0, 0, 0, 1, 0, 0, 0, 60, 0, 0, 0, 1, 5, 83, 71, 0, 5, 0, 0, - 110, 10, 0, 0, 19, 19, + 126, 10, 0, 0, 19, 19, 68, 37, 60, 0, 0, 0, 24, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, @@ -393,136 +389,136 @@ const BYTE primitive_point_list_gs[] = 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 156, 7, 0, 0, 168, 0, + 158, 7, 0, 0, 168, 0, 0, 0, 8, 0, 0, 0, 2, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 179, 7, + 0, 0, 0, 0, 197, 7, 0, 0, 176, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 212, 7, 0, 0, + 0, 0, 230, 7, 0, 0, 180, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 228, 7, 0, 0, 184, 0, + 246, 7, 0, 0, 184, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 116, 6, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 249, 7, + 0, 0, 0, 0, 11, 8, 0, 0, 192, 0, 0, 0, 32, 0, 0, 0, 0, 0, - 0, 0, 28, 8, 0, 0, + 0, 0, 44, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 64, 8, 0, 0, + 0, 0, 80, 8, 0, 0, 224, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 85, 8, 0, 0, 228, 0, + 101, 8, 0, 0, 228, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 52, 7, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 109, 8, + 0, 0, 0, 0, 125, 8, 0, 0, 232, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 126, 8, 0, 0, + 0, 0, 142, 8, 0, 0, 236, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 166, 8, 0, 0, 240, 0, + 182, 8, 0, 0, 240, 0, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 184, 8, + 0, 0, 0, 0, 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 220, 8, + 0, 0, 0, 0, 236, 8, 0, 0, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 247, 8, 0, 0, + 0, 0, 7, 9, 0, 0, 8, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 17, 9, 0, 0, 16, 1, + 33, 9, 0, 0, 16, 1, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 51, 9, + 0, 0, 0, 0, 67, 9, 0, 0, 32, 1, 0, 0, 32, 0, 0, 0, 0, 0, - 0, 0, 68, 9, 0, 0, + 0, 0, 84, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 104, 9, 0, 0, + 0, 0, 120, 9, 0, 0, 64, 1, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 136, 9, 0, 0, 0, 0, + 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 172, 9, 0, 0, 80, 1, + 188, 9, 0, 0, 80, 1, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 136, 9, + 0, 0, 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 197, 9, + 0, 0, 0, 0, 213, 9, 0, 0, 96, 1, 0, 0, 64, 0, 0, 0, 0, 0, - 0, 0, 216, 9, 0, 0, + 0, 0, 232, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 252, 9, 0, 0, + 0, 0, 12, 10, 0, 0, 160, 1, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 20, 10, 0, 0, 0, 0, + 36, 10, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 56, 10, 0, 0, 192, 1, + 72, 10, 0, 0, 192, 1, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 136, 9, + 0, 0, 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 86, 10, + 0, 0, 0, 0, 102, 10, 0, 0, 208, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 184, 8, 0, 0, + 0, 0, 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, @@ -612,12 +608,15 @@ const BYTE primitive_point_list_gs[] = 97, 120, 0, 120, 101, 95, 112, 111, 105, 110, 116, 95, 99, 111, 110, 115, 116, 97, - 110, 116, 95, 114, 97, 100, - 105, 117, 115, 0, 120, 101, - 95, 112, 111, 105, 110, 116, - 95, 115, 99, 114, 101, 101, - 110, 95, 116, 111, 95, 110, - 100, 99, 0, 120, 101, 95, + 110, 116, 95, 100, 105, 97, + 109, 101, 116, 101, 114, 0, + 120, 101, 95, 112, 111, 105, + 110, 116, 95, 115, 99, 114, + 101, 101, 110, 95, 100, 105, + 97, 109, 101, 116, 101, 114, + 95, 116, 111, 95, 110, 100, + 99, 95, 114, 97, 100, 105, + 117, 115, 0, 120, 101, 95, 105, 110, 116, 101, 114, 112, 111, 108, 97, 116, 111, 114, 95, 115, 97, 109, 112, 108, @@ -634,513 +633,596 @@ const BYTE primitive_point_list_gs[] = 115, 119, 105, 122, 122, 108, 101, 100, 95, 115, 105, 103, 110, 115, 0, 117, 105, 110, - 116, 52, 0, 171, 171, 171, + 116, 52, 0, 171, 1, 0, + 19, 0, 1, 0, 4, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 37, 8, 0, 0, 120, 101, + 95, 116, 101, 120, 116, 117, + 114, 101, 115, 95, 114, 101, + 115, 111, 108, 118, 101, 100, + 0, 120, 101, 95, 97, 108, + 112, 104, 97, 95, 116, 101, + 115, 116, 95, 114, 101, 102, + 101, 114, 101, 110, 99, 101, + 0, 120, 101, 95, 97, 108, + 112, 104, 97, 95, 116, 111, + 95, 109, 97, 115, 107, 0, + 120, 101, 95, 101, 100, 114, + 97, 109, 95, 51, 50, 98, + 112, 112, 95, 116, 105, 108, + 101, 95, 112, 105, 116, 99, + 104, 95, 100, 119, 111, 114, + 100, 115, 95, 115, 99, 97, + 108, 101, 100, 0, 120, 101, + 95, 99, 111, 108, 111, 114, + 95, 101, 120, 112, 95, 98, + 105, 97, 115, 0, 1, 0, + 3, 0, 1, 0, 4, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 172, 6, 0, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 112, 111, 108, 121, 95, + 111, 102, 102, 115, 101, 116, + 95, 102, 114, 111, 110, 116, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 112, 111, + 108, 121, 95, 111, 102, 102, + 115, 101, 116, 95, 98, 97, + 99, 107, 0, 120, 101, 95, + 101, 100, 114, 97, 109, 95, + 100, 101, 112, 116, 104, 95, + 98, 97, 115, 101, 95, 100, + 119, 111, 114, 100, 115, 95, + 115, 99, 97, 108, 101, 100, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 115, 116, + 101, 110, 99, 105, 108, 0, 1, 0, 19, 0, 1, 0, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 19, 8, 0, 0, - 120, 101, 95, 116, 101, 120, - 116, 117, 114, 101, 115, 95, - 114, 101, 115, 111, 108, 118, - 101, 100, 0, 120, 101, 95, - 97, 108, 112, 104, 97, 95, - 116, 101, 115, 116, 95, 114, - 101, 102, 101, 114, 101, 110, - 99, 101, 0, 120, 101, 95, - 97, 108, 112, 104, 97, 95, - 116, 111, 95, 109, 97, 115, - 107, 0, 120, 101, 95, 101, - 100, 114, 97, 109, 95, 51, - 50, 98, 112, 112, 95, 116, - 105, 108, 101, 95, 112, 105, - 116, 99, 104, 95, 100, 119, - 111, 114, 100, 115, 95, 115, - 99, 97, 108, 101, 100, 0, - 120, 101, 95, 99, 111, 108, - 111, 114, 95, 101, 120, 112, - 95, 98, 105, 97, 115, 0, - 1, 0, 3, 0, 1, 0, + 0, 0, 37, 8, 0, 0, + 120, 101, 95, 101, 100, 114, + 97, 109, 95, 114, 116, 95, + 98, 97, 115, 101, 95, 100, + 119, 111, 114, 100, 115, 95, + 115, 99, 97, 108, 101, 100, + 0, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 102, 111, 114, 109, + 97, 116, 95, 102, 108, 97, + 103, 115, 0, 120, 101, 95, + 101, 100, 114, 97, 109, 95, + 114, 116, 95, 99, 108, 97, + 109, 112, 0, 171, 1, 0, + 3, 0, 1, 0, 4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 172, 6, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 112, 111, 108, - 121, 95, 111, 102, 102, 115, - 101, 116, 95, 102, 114, 111, - 110, 116, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 112, 111, 108, 121, 95, 111, - 102, 102, 115, 101, 116, 95, - 98, 97, 99, 107, 0, 120, - 101, 95, 101, 100, 114, 97, - 109, 95, 100, 101, 112, 116, - 104, 95, 98, 97, 115, 101, - 95, 100, 119, 111, 114, 100, - 115, 95, 115, 99, 97, 108, - 101, 100, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 115, 116, 101, 110, 99, 105, - 108, 0, 1, 0, 19, 0, - 1, 0, 4, 0, 2, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 8, - 0, 0, 120, 101, 95, 101, - 100, 114, 97, 109, 95, 114, - 116, 95, 98, 97, 115, 101, - 95, 100, 119, 111, 114, 100, - 115, 95, 115, 99, 97, 108, - 101, 100, 0, 171, 1, 0, - 19, 0, 1, 0, 4, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, + 172, 6, 0, 0, 120, 101, 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 102, 111, - 114, 109, 97, 116, 95, 102, - 108, 97, 103, 115, 0, 120, - 101, 95, 101, 100, 114, 97, - 109, 95, 114, 116, 95, 99, - 108, 97, 109, 112, 0, 171, - 1, 0, 3, 0, 1, 0, - 4, 0, 4, 0, 0, 0, + 95, 114, 116, 95, 107, 101, + 101, 112, 95, 109, 97, 115, + 107, 0, 171, 171, 1, 0, + 19, 0, 1, 0, 4, 0, + 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 172, 6, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 114, 116, 95, - 107, 101, 101, 112, 95, 109, - 97, 115, 107, 0, 171, 171, - 1, 0, 19, 0, 1, 0, - 4, 0, 2, 0, 0, 0, + 37, 8, 0, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 114, 116, 95, 98, 108, + 101, 110, 100, 95, 102, 97, + 99, 116, 111, 114, 115, 95, + 111, 112, 115, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 98, 108, 101, 110, 100, + 95, 99, 111, 110, 115, 116, + 97, 110, 116, 0, 77, 105, + 99, 114, 111, 115, 111, 102, + 116, 32, 40, 82, 41, 32, + 72, 76, 83, 76, 32, 83, + 104, 97, 100, 101, 114, 32, + 67, 111, 109, 112, 105, 108, + 101, 114, 32, 49, 48, 46, + 49, 0, 171, 171, 73, 83, + 71, 78, 56, 2, 0, 0, + 21, 0, 0, 0, 8, 0, + 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 19, 8, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 114, 116, 95, - 98, 108, 101, 110, 100, 95, - 102, 97, 99, 116, 111, 114, - 115, 95, 111, 112, 115, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 98, 108, 101, - 110, 100, 95, 99, 111, 110, - 115, 116, 97, 110, 116, 0, - 77, 105, 99, 114, 111, 115, - 111, 102, 116, 32, 40, 82, - 41, 32, 72, 76, 83, 76, - 32, 83, 104, 97, 100, 101, - 114, 32, 67, 111, 109, 112, - 105, 108, 101, 114, 32, 49, - 48, 46, 49, 0, 171, 171, - 73, 83, 71, 78, 56, 2, - 0, 0, 21, 0, 0, 0, - 8, 0, 0, 0, 0, 2, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 1, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 2, 0, 0, 0, - 15, 15, 0, 0, 0, 2, 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 1, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 1, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 3, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 4, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 4, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 5, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 5, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 6, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 6, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 7, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 7, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 8, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 8, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 9, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 9, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 10, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 10, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 11, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 11, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 12, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 12, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 13, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 13, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 14, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 14, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 15, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 15, 0, 0, 0, 15, 15, + 0, 0, 0, 2, 0, 0, + 16, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 16, 0, 0, 0, 7, 4, + 0, 0, 9, 2, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 17, 0, 0, 0, 15, 15, + 0, 0, 21, 2, 0, 0, + 0, 0, 0, 0, 2, 0, + 0, 0, 3, 0, 0, 0, + 18, 0, 0, 0, 15, 15, + 0, 0, 21, 2, 0, 0, + 1, 0, 0, 0, 2, 0, + 0, 0, 3, 0, 0, 0, + 19, 0, 0, 0, 3, 3, + 0, 0, 37, 2, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 4, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 4, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 5, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 5, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 6, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 6, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 7, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 7, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 8, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 8, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 9, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 9, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 10, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 10, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 11, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 11, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 12, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 12, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 13, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 13, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 14, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 14, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 15, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 15, 0, 0, 0, - 15, 15, 0, 0, 0, 2, - 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 16, 0, 0, 0, - 7, 4, 0, 0, 9, 2, + 19, 0, 0, 0, 4, 4, + 0, 0, 84, 69, 88, 67, + 79, 79, 82, 68, 0, 83, + 86, 95, 80, 111, 115, 105, + 116, 105, 111, 110, 0, 83, + 86, 95, 67, 108, 105, 112, + 68, 105, 115, 116, 97, 110, + 99, 101, 0, 83, 86, 95, + 67, 117, 108, 108, 68, 105, + 115, 116, 97, 110, 99, 101, + 0, 171, 171, 171, 79, 83, + 71, 53, 96, 2, 0, 0, + 20, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 3, 0, - 0, 0, 17, 0, 0, 0, - 15, 15, 0, 0, 21, 2, + 56, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 3, 0, - 0, 0, 18, 0, 0, 0, - 15, 15, 0, 0, 21, 2, + 3, 0, 0, 0, 0, 0, + 0, 0, 15, 0, 0, 0, + 0, 0, 0, 0, 56, 2, 0, 0, 1, 0, 0, 0, - 2, 0, 0, 0, 3, 0, - 0, 0, 19, 0, 0, 0, - 3, 3, 0, 0, 37, 2, + 0, 0, 0, 0, 3, 0, + 0, 0, 1, 0, 0, 0, + 15, 0, 0, 0, 0, 0, + 0, 0, 56, 2, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 2, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 0, + 56, 2, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, + 0, 0, 15, 0, 0, 0, + 0, 0, 0, 0, 56, 2, + 0, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 4, 0, 0, 0, + 15, 0, 0, 0, 0, 0, + 0, 0, 56, 2, 0, 0, + 5, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 5, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 0, + 56, 2, 0, 0, 6, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 6, 0, + 0, 0, 15, 0, 0, 0, + 0, 0, 0, 0, 56, 2, + 0, 0, 7, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 7, 0, 0, 0, + 15, 0, 0, 0, 0, 0, + 0, 0, 56, 2, 0, 0, + 8, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 8, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 0, + 56, 2, 0, 0, 9, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 9, 0, + 0, 0, 15, 0, 0, 0, + 0, 0, 0, 0, 56, 2, + 0, 0, 10, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 10, 0, 0, 0, + 15, 0, 0, 0, 0, 0, + 0, 0, 56, 2, 0, 0, + 11, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 11, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 0, + 56, 2, 0, 0, 12, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 12, 0, + 0, 0, 15, 0, 0, 0, + 0, 0, 0, 0, 56, 2, + 0, 0, 13, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 13, 0, 0, 0, + 15, 0, 0, 0, 0, 0, + 0, 0, 56, 2, 0, 0, + 14, 0, 0, 0, 0, 0, + 0, 0, 3, 0, 0, 0, + 14, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 0, + 56, 2, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 15, 0, + 0, 0, 15, 0, 0, 0, + 0, 0, 0, 0, 56, 2, + 0, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 3, 0, + 0, 0, 16, 0, 0, 0, + 7, 8, 0, 0, 0, 0, + 0, 0, 65, 2, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 17, 0, 0, 0, 15, 0, + 0, 0, 0, 0, 0, 0, + 77, 2, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, + 3, 0, 0, 0, 18, 0, + 0, 0, 15, 0, 0, 0, + 0, 0, 0, 0, 77, 2, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 3, 0, 0, 0, 19, 0, 0, 0, - 4, 4, 0, 0, 84, 69, + 3, 12, 0, 0, 84, 69, 88, 67, 79, 79, 82, 68, 0, 83, 86, 95, 80, 111, 115, 105, 116, 105, 111, 110, 0, 83, 86, 95, 67, 108, 105, 112, 68, 105, 115, 116, - 97, 110, 99, 101, 0, 83, - 86, 95, 67, 117, 108, 108, - 68, 105, 115, 116, 97, 110, - 99, 101, 0, 171, 171, 171, - 79, 83, 71, 53, 96, 2, - 0, 0, 20, 0, 0, 0, - 8, 0, 0, 0, 0, 0, - 0, 0, 56, 2, 0, 0, + 97, 110, 99, 101, 0, 171, + 171, 171, 83, 72, 69, 88, + 100, 13, 0, 0, 81, 0, + 2, 0, 89, 3, 0, 0, + 106, 8, 0, 1, 89, 0, + 0, 7, 70, 142, 48, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, - 56, 2, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 1, 0, - 0, 0, 15, 0, 0, 0, - 0, 0, 0, 0, 56, 2, - 0, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 2, 0, 0, 0, - 15, 0, 0, 0, 0, 0, - 0, 0, 56, 2, 0, 0, - 3, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 3, 0, 0, 0, 15, 0, - 0, 0, 0, 0, 0, 0, - 56, 2, 0, 0, 4, 0, - 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 4, 0, - 0, 0, 15, 0, 0, 0, - 0, 0, 0, 0, 56, 2, - 0, 0, 5, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 5, 0, 0, 0, - 15, 0, 0, 0, 0, 0, - 0, 0, 56, 2, 0, 0, - 6, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 6, 0, 0, 0, 15, 0, - 0, 0, 0, 0, 0, 0, - 56, 2, 0, 0, 7, 0, - 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 7, 0, - 0, 0, 15, 0, 0, 0, - 0, 0, 0, 0, 56, 2, - 0, 0, 8, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 8, 0, 0, 0, - 15, 0, 0, 0, 0, 0, - 0, 0, 56, 2, 0, 0, - 9, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 9, 0, 0, 0, 15, 0, - 0, 0, 0, 0, 0, 0, - 56, 2, 0, 0, 10, 0, - 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 10, 0, - 0, 0, 15, 0, 0, 0, - 0, 0, 0, 0, 56, 2, - 0, 0, 11, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 11, 0, 0, 0, - 15, 0, 0, 0, 0, 0, - 0, 0, 56, 2, 0, 0, - 12, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 12, 0, 0, 0, 15, 0, - 0, 0, 0, 0, 0, 0, - 56, 2, 0, 0, 13, 0, - 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 13, 0, - 0, 0, 15, 0, 0, 0, - 0, 0, 0, 0, 56, 2, - 0, 0, 14, 0, 0, 0, - 0, 0, 0, 0, 3, 0, - 0, 0, 14, 0, 0, 0, - 15, 0, 0, 0, 0, 0, - 0, 0, 56, 2, 0, 0, - 15, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 15, 0, 0, 0, 15, 0, - 0, 0, 0, 0, 0, 0, - 56, 2, 0, 0, 16, 0, - 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 16, 0, - 0, 0, 7, 8, 0, 0, - 0, 0, 0, 0, 65, 2, - 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 3, 0, - 0, 0, 17, 0, 0, 0, - 15, 0, 0, 0, 0, 0, - 0, 0, 77, 2, 0, 0, - 0, 0, 0, 0, 2, 0, - 0, 0, 3, 0, 0, 0, - 18, 0, 0, 0, 15, 0, - 0, 0, 0, 0, 0, 0, - 77, 2, 0, 0, 1, 0, - 0, 0, 2, 0, 0, 0, - 3, 0, 0, 0, 19, 0, - 0, 0, 3, 12, 0, 0, - 84, 69, 88, 67, 79, 79, - 82, 68, 0, 83, 86, 95, - 80, 111, 115, 105, 116, 105, - 111, 110, 0, 83, 86, 95, - 67, 108, 105, 112, 68, 105, - 115, 116, 97, 110, 99, 101, - 0, 171, 171, 171, 83, 72, - 69, 88, 144, 13, 0, 0, - 81, 0, 2, 0, 100, 3, - 0, 0, 106, 8, 0, 1, - 89, 0, 0, 7, 70, 142, - 48, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 11, 0, 0, 0, - 0, 0, 0, 0, 95, 0, - 0, 4, 242, 16, 32, 0, - 1, 0, 0, 0, 0, 0, + 11, 0, 0, 0, 0, 0, 0, 0, 95, 0, 0, 4, 242, 16, 32, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 95, 0, 0, 4, 242, 16, + 32, 0, 1, 0, 0, 0, + 1, 0, 0, 0, 95, 0, + 0, 4, 242, 16, 32, 0, + 1, 0, 0, 0, 2, 0, + 0, 0, 95, 0, 0, 4, + 242, 16, 32, 0, 1, 0, + 0, 0, 3, 0, 0, 0, + 95, 0, 0, 4, 242, 16, + 32, 0, 1, 0, 0, 0, + 4, 0, 0, 0, 95, 0, + 0, 4, 242, 16, 32, 0, + 1, 0, 0, 0, 5, 0, + 0, 0, 95, 0, 0, 4, + 242, 16, 32, 0, 1, 0, + 0, 0, 6, 0, 0, 0, + 95, 0, 0, 4, 242, 16, + 32, 0, 1, 0, 0, 0, + 7, 0, 0, 0, 95, 0, + 0, 4, 242, 16, 32, 0, + 1, 0, 0, 0, 8, 0, + 0, 0, 95, 0, 0, 4, + 242, 16, 32, 0, 1, 0, + 0, 0, 9, 0, 0, 0, + 95, 0, 0, 4, 242, 16, + 32, 0, 1, 0, 0, 0, + 10, 0, 0, 0, 95, 0, + 0, 4, 242, 16, 32, 0, + 1, 0, 0, 0, 11, 0, + 0, 0, 95, 0, 0, 4, + 242, 16, 32, 0, 1, 0, + 0, 0, 12, 0, 0, 0, + 95, 0, 0, 4, 242, 16, + 32, 0, 1, 0, 0, 0, + 13, 0, 0, 0, 95, 0, + 0, 4, 242, 16, 32, 0, + 1, 0, 0, 0, 14, 0, + 0, 0, 95, 0, 0, 4, + 242, 16, 32, 0, 1, 0, + 0, 0, 15, 0, 0, 0, + 95, 0, 0, 4, 114, 16, + 32, 0, 1, 0, 0, 0, + 16, 0, 0, 0, 97, 0, + 0, 5, 242, 16, 32, 0, + 1, 0, 0, 0, 17, 0, 0, 0, 1, 0, 0, 0, 95, 0, 0, 4, 242, 16, 32, 0, 1, 0, 0, 0, - 2, 0, 0, 0, 95, 0, - 0, 4, 242, 16, 32, 0, - 1, 0, 0, 0, 3, 0, - 0, 0, 95, 0, 0, 4, - 242, 16, 32, 0, 1, 0, - 0, 0, 4, 0, 0, 0, - 95, 0, 0, 4, 242, 16, - 32, 0, 1, 0, 0, 0, - 5, 0, 0, 0, 95, 0, - 0, 4, 242, 16, 32, 0, - 1, 0, 0, 0, 6, 0, - 0, 0, 95, 0, 0, 4, - 242, 16, 32, 0, 1, 0, - 0, 0, 7, 0, 0, 0, - 95, 0, 0, 4, 242, 16, - 32, 0, 1, 0, 0, 0, - 8, 0, 0, 0, 95, 0, - 0, 4, 242, 16, 32, 0, - 1, 0, 0, 0, 9, 0, - 0, 0, 95, 0, 0, 4, - 242, 16, 32, 0, 1, 0, - 0, 0, 10, 0, 0, 0, - 95, 0, 0, 4, 242, 16, - 32, 0, 1, 0, 0, 0, - 11, 0, 0, 0, 95, 0, - 0, 4, 242, 16, 32, 0, - 1, 0, 0, 0, 12, 0, - 0, 0, 95, 0, 0, 4, - 242, 16, 32, 0, 1, 0, - 0, 0, 13, 0, 0, 0, - 95, 0, 0, 4, 242, 16, - 32, 0, 1, 0, 0, 0, - 14, 0, 0, 0, 95, 0, - 0, 4, 242, 16, 32, 0, - 1, 0, 0, 0, 15, 0, - 0, 0, 95, 0, 0, 4, - 114, 16, 32, 0, 1, 0, - 0, 0, 16, 0, 0, 0, - 97, 0, 0, 5, 242, 16, - 32, 0, 1, 0, 0, 0, - 17, 0, 0, 0, 1, 0, - 0, 0, 95, 0, 0, 4, - 242, 16, 32, 0, 1, 0, - 0, 0, 18, 0, 0, 0, - 95, 0, 0, 4, 50, 16, - 32, 0, 1, 0, 0, 0, - 19, 0, 0, 0, 95, 0, - 0, 4, 66, 16, 32, 0, + 18, 0, 0, 0, 95, 0, + 0, 4, 50, 16, 32, 0, 1, 0, 0, 0, 19, 0, - 0, 0, 104, 0, 0, 2, - 3, 0, 0, 0, 93, 8, - 0, 1, 143, 0, 0, 3, - 0, 0, 17, 0, 0, 0, - 0, 0, 92, 40, 0, 1, - 101, 0, 0, 3, 242, 32, - 16, 0, 0, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 1, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 2, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 3, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 4, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 5, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 6, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 7, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 8, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 9, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 10, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 11, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 12, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 13, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 14, 0, 0, 0, - 101, 0, 0, 3, 242, 32, - 16, 0, 15, 0, 0, 0, - 101, 0, 0, 3, 114, 32, - 16, 0, 16, 0, 0, 0, - 103, 0, 0, 4, 242, 32, - 16, 0, 17, 0, 0, 0, - 1, 0, 0, 0, 103, 0, + 0, 0, 95, 0, 0, 4, + 66, 16, 32, 0, 1, 0, + 0, 0, 19, 0, 0, 0, + 104, 0, 0, 2, 3, 0, + 0, 0, 93, 8, 0, 1, + 143, 0, 0, 3, 0, 0, + 17, 0, 0, 0, 0, 0, + 92, 40, 0, 1, 101, 0, + 0, 3, 242, 32, 16, 0, + 0, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 1, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 2, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 3, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 4, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 5, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 6, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 7, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 8, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 9, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 10, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 11, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 12, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 13, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 14, 0, 0, 0, 101, 0, + 0, 3, 242, 32, 16, 0, + 15, 0, 0, 0, 101, 0, + 0, 3, 114, 32, 16, 0, + 16, 0, 0, 0, 103, 0, 0, 4, 242, 32, 16, 0, - 18, 0, 0, 0, 2, 0, + 17, 0, 0, 0, 1, 0, 0, 0, 103, 0, 0, 4, - 50, 32, 16, 0, 19, 0, + 242, 32, 16, 0, 18, 0, 0, 0, 2, 0, 0, 0, - 94, 0, 0, 2, 4, 0, - 0, 0, 49, 0, 8, 8, - 18, 0, 16, 0, 0, 0, - 0, 0, 42, 16, 32, 0, - 0, 0, 0, 0, 19, 0, - 0, 0, 1, 64, 0, 0, - 0, 0, 0, 0, 57, 0, - 120, 9, 242, 0, 16, 0, - 1, 0, 0, 0, 70, 30, - 32, 0, 0, 0, 0, 0, - 17, 0, 0, 0, 70, 30, - 32, 0, 0, 0, 0, 0, - 17, 0, 0, 0, 60, 0, - 48, 7, 98, 0, 16, 0, - 0, 0, 0, 0, 166, 11, - 16, 0, 1, 0, 0, 0, - 6, 1, 16, 0, 1, 0, - 0, 0, 60, 0, 16, 7, - 34, 0, 16, 0, 0, 0, - 0, 0, 42, 0, 16, 0, - 0, 0, 0, 0, 26, 0, - 16, 0, 0, 0, 0, 0, - 60, 0, 8, 7, 18, 0, - 16, 0, 0, 0, 0, 0, - 26, 0, 16, 0, 0, 0, - 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 31, 0, - 4, 3, 10, 0, 16, 0, - 0, 0, 0, 0, 62, 0, - 0, 1, 21, 0, 0, 1, - 29, 0, 8, 8, 18, 0, + 103, 0, 0, 4, 50, 32, + 16, 0, 19, 0, 0, 0, + 2, 0, 0, 0, 94, 0, + 0, 2, 4, 0, 0, 0, + 49, 0, 8, 8, 18, 0, 16, 0, 0, 0, 0, 0, 42, 16, 32, 0, 0, 0, - 0, 0, 16, 0, 0, 0, + 0, 0, 19, 0, 0, 0, 1, 64, 0, 0, 0, 0, + 0, 0, 57, 0, 120, 9, + 242, 0, 16, 0, 1, 0, + 0, 0, 70, 30, 32, 0, + 0, 0, 0, 0, 17, 0, + 0, 0, 70, 30, 32, 0, + 0, 0, 0, 0, 17, 0, + 0, 0, 60, 0, 48, 7, + 98, 0, 16, 0, 0, 0, + 0, 0, 166, 11, 16, 0, + 1, 0, 0, 0, 6, 1, + 16, 0, 1, 0, 0, 0, + 60, 0, 16, 7, 34, 0, + 16, 0, 0, 0, 0, 0, + 42, 0, 16, 0, 0, 0, + 0, 0, 26, 0, 16, 0, + 0, 0, 0, 0, 60, 0, + 8, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 26, 0, + 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, 0, 0, 31, 0, 4, 3, 10, 0, 16, 0, 0, 0, - 0, 0, 56, 0, 24, 11, - 50, 0, 16, 0, 0, 0, - 0, 0, 2, 64, 0, 0, - 0, 0, 0, 63, 0, 0, - 0, 63, 0, 0, 0, 0, - 0, 0, 0, 0, 166, 26, + 0, 0, 62, 0, 0, 1, + 21, 0, 0, 1, 29, 0, + 8, 8, 18, 0, 16, 0, + 0, 0, 0, 0, 42, 16, 32, 0, 0, 0, 0, 0, - 16, 0, 0, 0, 18, 0, - 0, 1, 54, 0, 24, 7, - 50, 0, 16, 0, 0, 0, + 16, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 0, 0, + 55, 0, 24, 12, 50, 0, + 16, 0, 0, 0, 0, 0, + 6, 0, 16, 0, 0, 0, + 0, 0, 166, 26, 32, 0, + 0, 0, 0, 0, 16, 0, 0, 0, 70, 128, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, - 21, 0, 0, 1, 49, 0, - 96, 10, 194, 0, 16, 0, - 0, 0, 0, 0, 2, 64, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 6, 4, 16, 0, 0, 0, - 0, 0, 1, 0, 32, 7, - 66, 0, 16, 0, 0, 0, - 0, 0, 58, 0, 16, 0, - 0, 0, 0, 0, 42, 0, + 49, 0, 96, 10, 194, 0, 16, 0, 0, 0, 0, 0, - 31, 0, 0, 3, 42, 0, + 2, 64, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 6, 4, 16, 0, + 0, 0, 0, 0, 1, 0, + 32, 7, 66, 0, 16, 0, + 0, 0, 0, 0, 58, 0, 16, 0, 0, 0, 0, 0, - 62, 0, 0, 1, 21, 0, - 0, 1, 56, 0, 24, 9, - 50, 0, 16, 0, 0, 0, - 0, 0, 70, 0, 16, 0, - 0, 0, 0, 0, 230, 138, - 48, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 10, 0, - 0, 0, 56, 0, 24, 8, - 50, 0, 16, 0, 0, 0, - 0, 0, 70, 0, 16, 0, - 0, 0, 0, 0, 246, 31, + 42, 0, 16, 0, 0, 0, + 0, 0, 31, 0, 0, 3, + 42, 0, 16, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 21, 0, 0, 1, 56, 0, + 24, 9, 50, 0, 16, 0, + 0, 0, 0, 0, 70, 0, + 16, 0, 0, 0, 0, 0, + 230, 138, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 10, 0, 0, 0, 56, 0, + 24, 8, 50, 0, 16, 0, + 0, 0, 0, 0, 70, 0, + 16, 0, 0, 0, 0, 0, + 246, 31, 32, 0, 0, 0, + 0, 0, 17, 0, 0, 0, + 54, 0, 56, 6, 114, 0, + 16, 0, 1, 0, 0, 0, + 6, 1, 16, 128, 65, 0, + 0, 0, 0, 0, 0, 0, + 54, 0, 64, 5, 130, 0, + 16, 0, 1, 0, 0, 0, + 26, 0, 16, 0, 0, 0, + 0, 0, 0, 0, 120, 8, + 242, 0, 16, 0, 2, 0, + 0, 0, 198, 9, 16, 0, + 1, 0, 0, 0, 70, 20, 32, 0, 0, 0, 0, 0, 17, 0, 0, 0, 54, 0, - 56, 6, 114, 0, 16, 0, - 1, 0, 0, 0, 6, 1, - 16, 128, 65, 0, 0, 0, + 0, 6, 242, 32, 16, 0, + 0, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, 0, - 64, 5, 130, 0, 16, 0, - 1, 0, 0, 0, 26, 0, - 16, 0, 0, 0, 0, 0, - 0, 0, 120, 8, 242, 0, - 16, 0, 2, 0, 0, 0, - 198, 9, 16, 0, 1, 0, - 0, 0, 70, 20, 32, 0, + 0, 6, 242, 32, 16, 0, + 1, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 2, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 3, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 4, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 5, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 6, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 6, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 7, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 7, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 8, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 8, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 9, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 9, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 10, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 10, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 11, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 11, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 12, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 12, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 13, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 13, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 14, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 14, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 15, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 54, 0, + 0, 8, 50, 32, 16, 0, + 16, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 54, 0, 0, 6, 66, 32, + 16, 0, 16, 0, 0, 0, + 42, 16, 32, 0, 0, 0, + 0, 0, 16, 0, 0, 0, + 54, 0, 0, 5, 50, 32, + 16, 0, 17, 0, 0, 0, + 70, 0, 16, 0, 2, 0, + 0, 0, 54, 0, 0, 6, + 194, 32, 16, 0, 17, 0, + 0, 0, 166, 30, 32, 0, 0, 0, 0, 0, 17, 0, 0, 0, 54, 0, 0, 6, + 242, 32, 16, 0, 18, 0, + 0, 0, 70, 30, 32, 0, + 0, 0, 0, 0, 18, 0, + 0, 0, 54, 0, 0, 6, + 50, 32, 16, 0, 19, 0, + 0, 0, 70, 16, 32, 0, + 0, 0, 0, 0, 19, 0, + 0, 0, 117, 0, 0, 3, + 0, 0, 17, 0, 0, 0, + 0, 0, 54, 0, 0, 6, 242, 32, 16, 0, 0, 0, 0, 0, 70, 30, 32, 0, 0, 0, 0, 0, 0, 0, @@ -1208,14 +1290,14 @@ const BYTE primitive_point_list_gs[] = 50, 32, 16, 0, 16, 0, 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, + 128, 63, 0, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 6, 66, 32, 16, 0, 16, 0, 0, 0, 42, 16, 32, 0, 0, 0, 0, 0, 16, 0, 0, 0, 54, 0, 0, 5, 50, 32, 16, 0, - 17, 0, 0, 0, 70, 0, + 17, 0, 0, 0, 230, 10, 16, 0, 2, 0, 0, 0, 54, 0, 0, 6, 194, 32, 16, 0, 17, 0, 0, 0, @@ -1231,200 +1313,10 @@ const BYTE primitive_point_list_gs[] = 0, 0, 19, 0, 0, 0, 117, 0, 0, 3, 0, 0, 17, 0, 0, 0, 0, 0, - 54, 0, 0, 6, 242, 32, + 0, 0, 80, 8, 162, 0, 16, 0, 0, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 1, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 1, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 2, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 2, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 3, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 4, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 4, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 5, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 5, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 6, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 6, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 7, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 7, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 8, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 8, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 9, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 9, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 10, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 10, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 11, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 11, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 12, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 12, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 13, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 13, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 14, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 14, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 15, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 15, 0, 0, 0, - 54, 0, 0, 8, 50, 32, - 16, 0, 16, 0, 0, 0, - 2, 64, 0, 0, 0, 0, - 0, 0, 0, 0, 128, 63, - 0, 0, 0, 0, 0, 0, - 0, 0, 54, 0, 0, 6, - 66, 32, 16, 0, 16, 0, - 0, 0, 42, 16, 32, 0, - 0, 0, 0, 0, 16, 0, - 0, 0, 54, 0, 0, 5, - 50, 32, 16, 0, 17, 0, - 0, 0, 230, 10, 16, 0, - 2, 0, 0, 0, 54, 0, - 0, 6, 194, 32, 16, 0, - 17, 0, 0, 0, 166, 30, - 32, 0, 0, 0, 0, 0, - 17, 0, 0, 0, 54, 0, - 0, 6, 242, 32, 16, 0, - 18, 0, 0, 0, 70, 30, - 32, 0, 0, 0, 0, 0, - 18, 0, 0, 0, 54, 0, - 0, 6, 50, 32, 16, 0, - 19, 0, 0, 0, 70, 16, - 32, 0, 0, 0, 0, 0, - 19, 0, 0, 0, 117, 0, - 0, 3, 0, 0, 17, 0, - 0, 0, 0, 0, 0, 0, - 80, 8, 162, 0, 16, 0, - 0, 0, 0, 0, 6, 4, - 16, 0, 0, 0, 0, 0, - 6, 20, 32, 0, 0, 0, - 0, 0, 17, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 0, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 1, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 1, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 2, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 2, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 3, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 4, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 4, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 5, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 5, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 6, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 6, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 7, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 7, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 8, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 8, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 9, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 9, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 10, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 10, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 11, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 11, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 12, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 12, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 13, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 13, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 14, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 14, 0, 0, 0, - 54, 0, 0, 6, 242, 32, - 16, 0, 15, 0, 0, 0, - 70, 30, 32, 0, 0, 0, - 0, 0, 15, 0, 0, 0, - 54, 0, 0, 8, 50, 32, - 16, 0, 16, 0, 0, 0, - 2, 64, 0, 0, 0, 0, - 128, 63, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 54, 0, 0, 6, - 66, 32, 16, 0, 16, 0, - 0, 0, 42, 16, 32, 0, - 0, 0, 0, 0, 16, 0, - 0, 0, 54, 0, 0, 5, - 50, 32, 16, 0, 17, 0, - 0, 0, 214, 5, 16, 0, - 0, 0, 0, 0, 54, 0, - 0, 6, 194, 32, 16, 0, - 17, 0, 0, 0, 166, 30, - 32, 0, 0, 0, 0, 0, - 17, 0, 0, 0, 54, 0, - 0, 6, 242, 32, 16, 0, - 18, 0, 0, 0, 70, 30, - 32, 0, 0, 0, 0, 0, - 18, 0, 0, 0, 54, 0, - 0, 6, 50, 32, 16, 0, - 19, 0, 0, 0, 70, 16, - 32, 0, 0, 0, 0, 0, - 19, 0, 0, 0, 117, 0, - 0, 3, 0, 0, 17, 0, - 0, 0, 0, 0, 54, 0, - 32, 5, 66, 0, 16, 0, - 0, 0, 0, 0, 42, 0, - 16, 0, 1, 0, 0, 0, - 0, 0, 24, 8, 50, 0, - 16, 0, 0, 0, 0, 0, - 134, 0, 16, 0, 0, 0, - 0, 0, 70, 16, 32, 0, + 6, 4, 16, 0, 0, 0, + 0, 0, 6, 20, 32, 0, 0, 0, 0, 0, 17, 0, 0, 0, 54, 0, 0, 6, 242, 32, 16, 0, 0, 0, @@ -1494,14 +1386,14 @@ const BYTE primitive_point_list_gs[] = 50, 32, 16, 0, 16, 0, 0, 0, 2, 64, 0, 0, 0, 0, 128, 63, 0, 0, - 128, 63, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, 0, 0, 6, 66, 32, 16, 0, 16, 0, 0, 0, 42, 16, 32, 0, 0, 0, 0, 0, 16, 0, 0, 0, 54, 0, 0, 5, 50, 32, 16, 0, - 17, 0, 0, 0, 70, 0, + 17, 0, 0, 0, 214, 5, 16, 0, 0, 0, 0, 0, 54, 0, 0, 6, 194, 32, 16, 0, 17, 0, 0, 0, @@ -1517,33 +1409,132 @@ const BYTE primitive_point_list_gs[] = 0, 0, 19, 0, 0, 0, 117, 0, 0, 3, 0, 0, 17, 0, 0, 0, 0, 0, - 118, 0, 0, 3, 0, 0, - 17, 0, 0, 0, 0, 0, - 62, 0, 0, 1, 83, 84, - 65, 84, 148, 0, 0, 0, - 121, 0, 0, 0, 3, 0, + 54, 0, 32, 5, 66, 0, + 16, 0, 0, 0, 0, 0, + 42, 0, 16, 0, 1, 0, + 0, 0, 0, 0, 24, 8, + 50, 0, 16, 0, 0, 0, + 0, 0, 134, 0, 16, 0, + 0, 0, 0, 0, 70, 16, + 32, 0, 0, 0, 0, 0, + 17, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 0, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 1, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 2, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 3, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 3, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 4, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 5, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 5, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 6, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 6, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 7, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 7, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 8, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 8, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 9, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 9, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 10, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 10, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 11, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 11, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 12, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 12, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 13, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 13, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 14, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 14, 0, 0, 0, 54, 0, + 0, 6, 242, 32, 16, 0, + 15, 0, 0, 0, 70, 30, + 32, 0, 0, 0, 0, 0, + 15, 0, 0, 0, 54, 0, + 0, 8, 50, 32, 16, 0, + 16, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 128, 63, + 0, 0, 128, 63, 0, 0, 0, 0, 0, 0, 0, 0, - 41, 0, 0, 0, 11, 0, - 0, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 4, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 4, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 0, + 54, 0, 0, 6, 66, 32, + 16, 0, 16, 0, 0, 0, + 42, 16, 32, 0, 0, 0, + 0, 0, 16, 0, 0, 0, + 54, 0, 0, 5, 50, 32, + 16, 0, 17, 0, 0, 0, + 70, 0, 16, 0, 0, 0, + 0, 0, 54, 0, 0, 6, + 194, 32, 16, 0, 17, 0, + 0, 0, 166, 30, 32, 0, + 0, 0, 0, 0, 17, 0, + 0, 0, 54, 0, 0, 6, + 242, 32, 16, 0, 18, 0, + 0, 0, 70, 30, 32, 0, + 0, 0, 0, 0, 18, 0, + 0, 0, 54, 0, 0, 6, + 50, 32, 16, 0, 19, 0, + 0, 0, 70, 16, 32, 0, + 0, 0, 0, 0, 19, 0, + 0, 0, 117, 0, 0, 3, + 0, 0, 17, 0, 0, 0, + 0, 0, 118, 0, 0, 3, + 0, 0, 17, 0, 0, 0, + 0, 0, 62, 0, 0, 1, + 83, 84, 65, 84, 148, 0, + 0, 0, 117, 0, 0, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 41, 0, 0, 0, + 10, 0, 0, 0, 0, 0, + 0, 0, 4, 0, 0, 0, + 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, - 5, 0, 0, 0, 4, 0, + 4, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 5, 0, 0, 0, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0 }; diff --git a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/tessellation_adaptive_vs.h b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/tessellation_adaptive_vs.h index 1c27f6b7f..b93e23695 100644 --- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/tessellation_adaptive_vs.h +++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/tessellation_adaptive_vs.h @@ -19,8 +19,8 @@ // float xe_point_vertex_diameter_min;// Offset: 140 Size: 4 [unused] // float3 xe_ndc_offset; // Offset: 144 Size: 12 [unused] // float xe_point_vertex_diameter_max;// Offset: 156 Size: 4 [unused] -// float2 xe_point_constant_radius; // Offset: 160 Size: 8 [unused] -// float2 xe_point_screen_to_ndc; // Offset: 168 Size: 8 [unused] +// float2 xe_point_constant_diameter; // Offset: 160 Size: 8 [unused] +// float2 xe_point_screen_diameter_to_ndc_radius;// Offset: 168 Size: 8 [unused] // uint xe_interpolator_sampling_pattern;// Offset: 176 Size: 4 [unused] // uint xe_ps_param_gen; // Offset: 180 Size: 4 [unused] // uint2 xe_sample_count_log2; // Offset: 184 Size: 8 [unused] @@ -94,21 +94,21 @@ ret const BYTE tessellation_adaptive_vs[] = { - 68, 88, 66, 67, 208, 91, - 167, 102, 8, 237, 14, 199, - 43, 1, 173, 204, 50, 149, - 119, 147, 1, 0, 0, 0, - 224, 13, 0, 0, 5, 0, + 68, 88, 66, 67, 128, 42, + 162, 230, 93, 182, 94, 173, + 222, 50, 66, 199, 253, 227, + 107, 225, 1, 0, 0, 0, + 240, 13, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, - 212, 10, 0, 0, 8, 11, - 0, 0, 64, 11, 0, 0, - 68, 13, 0, 0, 82, 68, - 69, 70, 152, 10, 0, 0, + 228, 10, 0, 0, 24, 11, + 0, 0, 80, 11, 0, 0, + 84, 13, 0, 0, 82, 68, + 69, 70, 168, 10, 0, 0, 1, 0, 0, 0, 120, 0, 0, 0, 1, 0, 0, 0, 60, 0, 0, 0, 1, 5, 254, 255, 0, 5, 0, 0, - 110, 10, 0, 0, 19, 19, + 126, 10, 0, 0, 19, 19, 68, 37, 60, 0, 0, 0, 24, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, @@ -208,136 +208,136 @@ const BYTE tessellation_adaptive_vs[] = 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 156, 7, 0, 0, 168, 0, + 158, 7, 0, 0, 168, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 179, 7, + 0, 0, 0, 0, 197, 7, 0, 0, 176, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 212, 7, 0, 0, + 0, 0, 230, 7, 0, 0, 180, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 228, 7, 0, 0, 184, 0, + 246, 7, 0, 0, 184, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 116, 6, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 249, 7, + 0, 0, 0, 0, 11, 8, 0, 0, 192, 0, 0, 0, 32, 0, 0, 0, 0, 0, - 0, 0, 28, 8, 0, 0, + 0, 0, 44, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 64, 8, 0, 0, + 0, 0, 80, 8, 0, 0, 224, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 85, 8, 0, 0, 228, 0, + 101, 8, 0, 0, 228, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 52, 7, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 109, 8, + 0, 0, 0, 0, 125, 8, 0, 0, 232, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 126, 8, 0, 0, + 0, 0, 142, 8, 0, 0, 236, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 166, 8, 0, 0, 240, 0, + 182, 8, 0, 0, 240, 0, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 184, 8, + 0, 0, 0, 0, 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 220, 8, + 0, 0, 0, 0, 236, 8, 0, 0, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 247, 8, 0, 0, + 0, 0, 7, 9, 0, 0, 8, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 17, 9, 0, 0, 16, 1, + 33, 9, 0, 0, 16, 1, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 51, 9, + 0, 0, 0, 0, 67, 9, 0, 0, 32, 1, 0, 0, 32, 0, 0, 0, 0, 0, - 0, 0, 68, 9, 0, 0, + 0, 0, 84, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 104, 9, 0, 0, + 0, 0, 120, 9, 0, 0, 64, 1, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 136, 9, 0, 0, 0, 0, + 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 172, 9, 0, 0, 80, 1, + 188, 9, 0, 0, 80, 1, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 136, 9, + 0, 0, 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 197, 9, + 0, 0, 0, 0, 213, 9, 0, 0, 96, 1, 0, 0, 64, 0, 0, 0, 0, 0, - 0, 0, 216, 9, 0, 0, + 0, 0, 232, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 252, 9, 0, 0, + 0, 0, 12, 10, 0, 0, 160, 1, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 20, 10, 0, 0, 0, 0, + 36, 10, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 56, 10, 0, 0, 192, 1, + 72, 10, 0, 0, 192, 1, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 136, 9, + 0, 0, 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 86, 10, + 0, 0, 0, 0, 102, 10, 0, 0, 208, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 184, 8, 0, 0, + 0, 0, 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, @@ -427,12 +427,15 @@ const BYTE tessellation_adaptive_vs[] = 97, 120, 0, 120, 101, 95, 112, 111, 105, 110, 116, 95, 99, 111, 110, 115, 116, 97, - 110, 116, 95, 114, 97, 100, - 105, 117, 115, 0, 120, 101, - 95, 112, 111, 105, 110, 116, - 95, 115, 99, 114, 101, 101, - 110, 95, 116, 111, 95, 110, - 100, 99, 0, 120, 101, 95, + 110, 116, 95, 100, 105, 97, + 109, 101, 116, 101, 114, 0, + 120, 101, 95, 112, 111, 105, + 110, 116, 95, 115, 99, 114, + 101, 101, 110, 95, 100, 105, + 97, 109, 101, 116, 101, 114, + 95, 116, 111, 95, 110, 100, + 99, 95, 114, 97, 100, 105, + 117, 115, 0, 120, 101, 95, 105, 110, 116, 101, 114, 112, 111, 108, 97, 116, 111, 114, 95, 115, 97, 109, 112, 108, @@ -449,232 +452,231 @@ const BYTE tessellation_adaptive_vs[] = 115, 119, 105, 122, 122, 108, 101, 100, 95, 115, 105, 103, 110, 115, 0, 117, 105, 110, - 116, 52, 0, 171, 171, 171, + 116, 52, 0, 171, 1, 0, + 19, 0, 1, 0, 4, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 37, 8, 0, 0, 120, 101, + 95, 116, 101, 120, 116, 117, + 114, 101, 115, 95, 114, 101, + 115, 111, 108, 118, 101, 100, + 0, 120, 101, 95, 97, 108, + 112, 104, 97, 95, 116, 101, + 115, 116, 95, 114, 101, 102, + 101, 114, 101, 110, 99, 101, + 0, 120, 101, 95, 97, 108, + 112, 104, 97, 95, 116, 111, + 95, 109, 97, 115, 107, 0, + 120, 101, 95, 101, 100, 114, + 97, 109, 95, 51, 50, 98, + 112, 112, 95, 116, 105, 108, + 101, 95, 112, 105, 116, 99, + 104, 95, 100, 119, 111, 114, + 100, 115, 95, 115, 99, 97, + 108, 101, 100, 0, 120, 101, + 95, 99, 111, 108, 111, 114, + 95, 101, 120, 112, 95, 98, + 105, 97, 115, 0, 1, 0, + 3, 0, 1, 0, 4, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 172, 6, 0, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 112, 111, 108, 121, 95, + 111, 102, 102, 115, 101, 116, + 95, 102, 114, 111, 110, 116, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 112, 111, + 108, 121, 95, 111, 102, 102, + 115, 101, 116, 95, 98, 97, + 99, 107, 0, 120, 101, 95, + 101, 100, 114, 97, 109, 95, + 100, 101, 112, 116, 104, 95, + 98, 97, 115, 101, 95, 100, + 119, 111, 114, 100, 115, 95, + 115, 99, 97, 108, 101, 100, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 115, 116, + 101, 110, 99, 105, 108, 0, 1, 0, 19, 0, 1, 0, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 19, 8, 0, 0, - 120, 101, 95, 116, 101, 120, - 116, 117, 114, 101, 115, 95, - 114, 101, 115, 111, 108, 118, - 101, 100, 0, 120, 101, 95, - 97, 108, 112, 104, 97, 95, - 116, 101, 115, 116, 95, 114, - 101, 102, 101, 114, 101, 110, - 99, 101, 0, 120, 101, 95, - 97, 108, 112, 104, 97, 95, - 116, 111, 95, 109, 97, 115, - 107, 0, 120, 101, 95, 101, - 100, 114, 97, 109, 95, 51, - 50, 98, 112, 112, 95, 116, - 105, 108, 101, 95, 112, 105, - 116, 99, 104, 95, 100, 119, - 111, 114, 100, 115, 95, 115, - 99, 97, 108, 101, 100, 0, - 120, 101, 95, 99, 111, 108, - 111, 114, 95, 101, 120, 112, - 95, 98, 105, 97, 115, 0, - 1, 0, 3, 0, 1, 0, + 0, 0, 37, 8, 0, 0, + 120, 101, 95, 101, 100, 114, + 97, 109, 95, 114, 116, 95, + 98, 97, 115, 101, 95, 100, + 119, 111, 114, 100, 115, 95, + 115, 99, 97, 108, 101, 100, + 0, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 102, 111, 114, 109, + 97, 116, 95, 102, 108, 97, + 103, 115, 0, 120, 101, 95, + 101, 100, 114, 97, 109, 95, + 114, 116, 95, 99, 108, 97, + 109, 112, 0, 171, 1, 0, + 3, 0, 1, 0, 4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 172, 6, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 112, 111, 108, - 121, 95, 111, 102, 102, 115, - 101, 116, 95, 102, 114, 111, - 110, 116, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 112, 111, 108, 121, 95, 111, - 102, 102, 115, 101, 116, 95, - 98, 97, 99, 107, 0, 120, - 101, 95, 101, 100, 114, 97, - 109, 95, 100, 101, 112, 116, - 104, 95, 98, 97, 115, 101, - 95, 100, 119, 111, 114, 100, - 115, 95, 115, 99, 97, 108, - 101, 100, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 115, 116, 101, 110, 99, 105, - 108, 0, 1, 0, 19, 0, - 1, 0, 4, 0, 2, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 8, - 0, 0, 120, 101, 95, 101, - 100, 114, 97, 109, 95, 114, - 116, 95, 98, 97, 115, 101, - 95, 100, 119, 111, 114, 100, - 115, 95, 115, 99, 97, 108, - 101, 100, 0, 171, 1, 0, - 19, 0, 1, 0, 4, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, + 172, 6, 0, 0, 120, 101, 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 102, 111, - 114, 109, 97, 116, 95, 102, - 108, 97, 103, 115, 0, 120, - 101, 95, 101, 100, 114, 97, - 109, 95, 114, 116, 95, 99, - 108, 97, 109, 112, 0, 171, - 1, 0, 3, 0, 1, 0, - 4, 0, 4, 0, 0, 0, + 95, 114, 116, 95, 107, 101, + 101, 112, 95, 109, 97, 115, + 107, 0, 171, 171, 1, 0, + 19, 0, 1, 0, 4, 0, + 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 172, 6, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 114, 116, 95, - 107, 101, 101, 112, 95, 109, - 97, 115, 107, 0, 171, 171, - 1, 0, 19, 0, 1, 0, - 4, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 19, 8, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 114, 116, 95, - 98, 108, 101, 110, 100, 95, - 102, 97, 99, 116, 111, 114, - 115, 95, 111, 112, 115, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 98, 108, 101, - 110, 100, 95, 99, 111, 110, - 115, 116, 97, 110, 116, 0, - 77, 105, 99, 114, 111, 115, - 111, 102, 116, 32, 40, 82, - 41, 32, 72, 76, 83, 76, - 32, 83, 104, 97, 100, 101, - 114, 32, 67, 111, 109, 112, - 105, 108, 101, 114, 32, 49, - 48, 46, 49, 0, 171, 171, - 73, 83, 71, 78, 44, 0, - 0, 0, 1, 0, 0, 0, - 8, 0, 0, 0, 32, 0, - 0, 0, 0, 0, 0, 0, - 6, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 1, 1, 0, 0, 83, 86, - 95, 86, 101, 114, 116, 101, - 120, 73, 68, 0, 79, 83, - 71, 78, 48, 0, 0, 0, + 37, 8, 0, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 114, 116, 95, 98, 108, + 101, 110, 100, 95, 102, 97, + 99, 116, 111, 114, 115, 95, + 111, 112, 115, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 98, 108, 101, 110, 100, + 95, 99, 111, 110, 115, 116, + 97, 110, 116, 0, 77, 105, + 99, 114, 111, 115, 111, 102, + 116, 32, 40, 82, 41, 32, + 72, 76, 83, 76, 32, 83, + 104, 97, 100, 101, 114, 32, + 67, 111, 109, 112, 105, 108, + 101, 114, 32, 49, 48, 46, + 49, 0, 171, 171, 73, 83, + 71, 78, 44, 0, 0, 0, 1, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 1, 14, - 0, 0, 88, 69, 84, 69, - 83, 83, 70, 65, 67, 84, - 79, 82, 0, 171, 171, 171, - 83, 72, 69, 88, 252, 1, - 0, 0, 81, 0, 1, 0, - 127, 0, 0, 0, 106, 8, - 0, 1, 89, 0, 0, 7, - 70, 142, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 2, 0, - 0, 0, 0, 0, 0, 0, - 96, 0, 0, 4, 18, 16, - 16, 0, 0, 0, 0, 0, - 6, 0, 0, 0, 101, 0, - 0, 3, 18, 32, 16, 0, - 0, 0, 0, 0, 104, 0, - 0, 2, 1, 0, 0, 0, - 32, 0, 0, 12, 114, 0, - 16, 0, 0, 0, 0, 0, - 6, 128, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 2, 64, + 0, 0, 0, 0, 6, 0, 0, 0, 1, 0, 0, 0, - 2, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 1, 1, + 0, 0, 83, 86, 95, 86, + 101, 114, 116, 101, 120, 73, + 68, 0, 79, 83, 71, 78, + 48, 0, 0, 0, 1, 0, + 0, 0, 8, 0, 0, 0, + 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 60, 0, 0, 7, 50, 0, + 3, 0, 0, 0, 0, 0, + 0, 0, 1, 14, 0, 0, + 88, 69, 84, 69, 83, 83, + 70, 65, 67, 84, 79, 82, + 0, 171, 171, 171, 83, 72, + 69, 88, 252, 1, 0, 0, + 81, 0, 1, 0, 127, 0, + 0, 0, 106, 8, 0, 1, + 89, 0, 0, 7, 70, 142, + 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 96, 0, + 0, 4, 18, 16, 16, 0, + 0, 0, 0, 0, 6, 0, + 0, 0, 101, 0, 0, 3, + 18, 32, 16, 0, 0, 0, + 0, 0, 104, 0, 0, 2, + 1, 0, 0, 0, 32, 0, + 0, 12, 114, 0, 16, 0, + 0, 0, 0, 0, 6, 128, + 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 2, 64, 0, 0, + 1, 0, 0, 0, 2, 0, + 0, 0, 3, 0, 0, 0, + 0, 0, 0, 0, 60, 0, + 0, 7, 50, 0, 16, 0, + 0, 0, 0, 0, 150, 5, 16, 0, 0, 0, 0, 0, - 150, 5, 16, 0, 0, 0, - 0, 0, 70, 0, 16, 0, - 0, 0, 0, 0, 31, 0, - 4, 3, 10, 0, 16, 0, - 0, 0, 0, 0, 41, 0, - 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 16, - 16, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 8, 0, - 0, 0, 85, 0, 0, 7, - 66, 0, 16, 0, 0, 0, + 70, 0, 16, 0, 0, 0, + 0, 0, 31, 0, 4, 3, + 10, 0, 16, 0, 0, 0, + 0, 0, 41, 0, 0, 7, + 18, 0, 16, 0, 0, 0, 0, 0, 10, 16, 16, 0, 0, 0, 0, 0, 1, 64, 0, 0, 8, 0, 0, 0, - 1, 0, 0, 10, 82, 0, - 16, 0, 0, 0, 0, 0, - 6, 2, 16, 0, 0, 0, - 0, 0, 2, 64, 0, 0, - 0, 255, 0, 255, 0, 0, - 0, 0, 255, 0, 255, 0, - 0, 0, 0, 0, 30, 0, - 0, 7, 18, 0, 16, 0, - 0, 0, 0, 0, 42, 0, - 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, - 0, 0, 18, 0, 0, 1, - 54, 0, 0, 5, 18, 0, + 85, 0, 0, 7, 66, 0, 16, 0, 0, 0, 0, 0, 10, 16, 16, 0, 0, 0, - 0, 0, 21, 0, 0, 1, - 31, 0, 4, 3, 26, 0, - 16, 0, 0, 0, 0, 0, - 85, 0, 0, 7, 34, 0, - 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, 0, 0, 1, 64, 0, 0, - 16, 0, 0, 0, 140, 0, - 0, 11, 18, 0, 16, 0, - 0, 0, 0, 0, 1, 64, - 0, 0, 16, 0, 0, 0, - 1, 64, 0, 0, 16, 0, - 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 26, 0, + 8, 0, 0, 0, 1, 0, + 0, 10, 82, 0, 16, 0, + 0, 0, 0, 0, 6, 2, 16, 0, 0, 0, 0, 0, - 21, 0, 0, 1, 0, 0, - 0, 7, 18, 0, 16, 0, + 2, 64, 0, 0, 0, 255, + 0, 255, 0, 0, 0, 0, + 255, 0, 255, 0, 0, 0, + 0, 0, 30, 0, 0, 7, + 18, 0, 16, 0, 0, 0, + 0, 0, 42, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, - 1, 64, 0, 0, 0, 0, - 128, 63, 52, 0, 0, 9, + 18, 0, 0, 1, 54, 0, + 0, 5, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 16, + 16, 0, 0, 0, 0, 0, + 21, 0, 0, 1, 31, 0, + 4, 3, 26, 0, 16, 0, + 0, 0, 0, 0, 85, 0, + 0, 7, 34, 0, 16, 0, + 0, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 16, 0, + 0, 0, 140, 0, 0, 11, + 18, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 16, 0, 0, 0, 1, 64, + 0, 0, 16, 0, 0, 0, + 10, 0, 16, 0, 0, 0, + 0, 0, 26, 0, 16, 0, + 0, 0, 0, 0, 21, 0, + 0, 1, 0, 0, 0, 7, 18, 0, 16, 0, 0, 0, 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 26, 128, - 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 64, + 0, 0, 0, 0, 128, 63, + 52, 0, 0, 9, 18, 0, + 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, + 0, 0, 26, 128, 48, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 51, 0, 0, 9, - 18, 32, 16, 0, 0, 0, - 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 42, 128, - 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 62, 0, 0, 1, - 83, 84, 65, 84, 148, 0, - 0, 0, 18, 0, 0, 0, - 1, 0, 0, 0, 0, 0, + 51, 0, 0, 9, 18, 32, + 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, + 0, 0, 42, 128, 48, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 62, 0, 0, 1, 83, 84, + 65, 84, 148, 0, 0, 0, + 18, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, + 2, 0, 0, 0, 3, 0, + 0, 0, 3, 0, 0, 0, + 4, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, - 3, 0, 0, 0, 3, 0, - 0, 0, 4, 0, 0, 0, - 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -685,5 +687,6 @@ const BYTE tessellation_adaptive_vs[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0 + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0 }; diff --git a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/tessellation_indexed_vs.h b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/tessellation_indexed_vs.h index 6646f5076..d8e448333 100644 --- a/src/xenia/gpu/shaders/bytecode/d3d12_5_1/tessellation_indexed_vs.h +++ b/src/xenia/gpu/shaders/bytecode/d3d12_5_1/tessellation_indexed_vs.h @@ -19,8 +19,8 @@ // float xe_point_vertex_diameter_min;// Offset: 140 Size: 4 [unused] // float3 xe_ndc_offset; // Offset: 144 Size: 12 [unused] // float xe_point_vertex_diameter_max;// Offset: 156 Size: 4 [unused] -// float2 xe_point_constant_radius; // Offset: 160 Size: 8 [unused] -// float2 xe_point_screen_to_ndc; // Offset: 168 Size: 8 [unused] +// float2 xe_point_constant_diameter; // Offset: 160 Size: 8 [unused] +// float2 xe_point_screen_diameter_to_ndc_radius;// Offset: 168 Size: 8 [unused] // uint xe_interpolator_sampling_pattern;// Offset: 176 Size: 4 [unused] // uint xe_ps_param_gen; // Offset: 180 Size: 4 [unused] // uint2 xe_sample_count_log2; // Offset: 184 Size: 8 [unused] @@ -96,21 +96,21 @@ ret const BYTE tessellation_indexed_vs[] = { - 68, 88, 66, 67, 188, 215, - 146, 114, 163, 91, 37, 43, - 43, 60, 196, 54, 82, 23, - 130, 140, 1, 0, 0, 0, - 20, 14, 0, 0, 5, 0, + 68, 88, 66, 67, 147, 89, + 233, 26, 127, 143, 37, 15, + 206, 150, 85, 19, 220, 93, + 185, 243, 1, 0, 0, 0, + 36, 14, 0, 0, 5, 0, 0, 0, 52, 0, 0, 0, - 212, 10, 0, 0, 8, 11, - 0, 0, 60, 11, 0, 0, - 120, 13, 0, 0, 82, 68, - 69, 70, 152, 10, 0, 0, + 228, 10, 0, 0, 24, 11, + 0, 0, 76, 11, 0, 0, + 136, 13, 0, 0, 82, 68, + 69, 70, 168, 10, 0, 0, 1, 0, 0, 0, 120, 0, 0, 0, 1, 0, 0, 0, 60, 0, 0, 0, 1, 5, 254, 255, 0, 5, 0, 0, - 110, 10, 0, 0, 19, 19, + 126, 10, 0, 0, 19, 19, 68, 37, 60, 0, 0, 0, 24, 0, 0, 0, 40, 0, 0, 0, 40, 0, 0, 0, @@ -210,136 +210,136 @@ const BYTE tessellation_indexed_vs[] = 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 156, 7, 0, 0, 168, 0, + 158, 7, 0, 0, 168, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 179, 7, + 0, 0, 0, 0, 197, 7, 0, 0, 176, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 212, 7, 0, 0, + 0, 0, 230, 7, 0, 0, 180, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 228, 7, 0, 0, 184, 0, + 246, 7, 0, 0, 184, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 116, 6, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 249, 7, + 0, 0, 0, 0, 11, 8, 0, 0, 192, 0, 0, 0, 32, 0, 0, 0, 0, 0, - 0, 0, 28, 8, 0, 0, + 0, 0, 44, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 64, 8, 0, 0, + 0, 0, 80, 8, 0, 0, 224, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 85, 8, 0, 0, 228, 0, + 101, 8, 0, 0, 228, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 52, 7, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 109, 8, + 0, 0, 0, 0, 125, 8, 0, 0, 232, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 126, 8, 0, 0, + 0, 0, 142, 8, 0, 0, 236, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 166, 8, 0, 0, 240, 0, + 182, 8, 0, 0, 240, 0, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 184, 8, + 0, 0, 0, 0, 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 220, 8, + 0, 0, 0, 0, 236, 8, 0, 0, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 247, 8, 0, 0, + 0, 0, 7, 9, 0, 0, 8, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 232, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 17, 9, 0, 0, 16, 1, + 33, 9, 0, 0, 16, 1, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 160, 5, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 51, 9, + 0, 0, 0, 0, 67, 9, 0, 0, 32, 1, 0, 0, 32, 0, 0, 0, 0, 0, - 0, 0, 68, 9, 0, 0, + 0, 0, 84, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 104, 9, 0, 0, + 0, 0, 120, 9, 0, 0, 64, 1, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, - 136, 9, 0, 0, 0, 0, + 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 172, 9, 0, 0, 80, 1, + 188, 9, 0, 0, 80, 1, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 136, 9, + 0, 0, 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 197, 9, + 0, 0, 0, 0, 213, 9, 0, 0, 96, 1, 0, 0, 64, 0, 0, 0, 0, 0, - 0, 0, 216, 9, 0, 0, + 0, 0, 232, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, - 0, 0, 252, 9, 0, 0, + 0, 0, 12, 10, 0, 0, 160, 1, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 20, 10, 0, 0, 0, 0, + 36, 10, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, - 56, 10, 0, 0, 192, 1, + 72, 10, 0, 0, 192, 1, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 0, 136, 9, + 0, 0, 0, 0, 152, 9, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, - 0, 0, 0, 0, 86, 10, + 0, 0, 0, 0, 102, 10, 0, 0, 208, 1, 0, 0, 16, 0, 0, 0, 0, 0, - 0, 0, 184, 8, 0, 0, + 0, 0, 200, 8, 0, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0, @@ -429,12 +429,15 @@ const BYTE tessellation_indexed_vs[] = 97, 120, 0, 120, 101, 95, 112, 111, 105, 110, 116, 95, 99, 111, 110, 115, 116, 97, - 110, 116, 95, 114, 97, 100, - 105, 117, 115, 0, 120, 101, - 95, 112, 111, 105, 110, 116, - 95, 115, 99, 114, 101, 101, - 110, 95, 116, 111, 95, 110, - 100, 99, 0, 120, 101, 95, + 110, 116, 95, 100, 105, 97, + 109, 101, 116, 101, 114, 0, + 120, 101, 95, 112, 111, 105, + 110, 116, 95, 115, 99, 114, + 101, 101, 110, 95, 100, 105, + 97, 109, 101, 116, 101, 114, + 95, 116, 111, 95, 110, 100, + 99, 95, 114, 97, 100, 105, + 117, 115, 0, 120, 101, 95, 105, 110, 116, 101, 114, 112, 111, 108, 97, 116, 111, 114, 95, 115, 97, 109, 112, 108, @@ -451,242 +454,242 @@ const BYTE tessellation_indexed_vs[] = 115, 119, 105, 122, 122, 108, 101, 100, 95, 115, 105, 103, 110, 115, 0, 117, 105, 110, - 116, 52, 0, 171, 171, 171, + 116, 52, 0, 171, 1, 0, + 19, 0, 1, 0, 4, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 37, 8, 0, 0, 120, 101, + 95, 116, 101, 120, 116, 117, + 114, 101, 115, 95, 114, 101, + 115, 111, 108, 118, 101, 100, + 0, 120, 101, 95, 97, 108, + 112, 104, 97, 95, 116, 101, + 115, 116, 95, 114, 101, 102, + 101, 114, 101, 110, 99, 101, + 0, 120, 101, 95, 97, 108, + 112, 104, 97, 95, 116, 111, + 95, 109, 97, 115, 107, 0, + 120, 101, 95, 101, 100, 114, + 97, 109, 95, 51, 50, 98, + 112, 112, 95, 116, 105, 108, + 101, 95, 112, 105, 116, 99, + 104, 95, 100, 119, 111, 114, + 100, 115, 95, 115, 99, 97, + 108, 101, 100, 0, 120, 101, + 95, 99, 111, 108, 111, 114, + 95, 101, 120, 112, 95, 98, + 105, 97, 115, 0, 1, 0, + 3, 0, 1, 0, 4, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 172, 6, 0, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 112, 111, 108, 121, 95, + 111, 102, 102, 115, 101, 116, + 95, 102, 114, 111, 110, 116, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 112, 111, + 108, 121, 95, 111, 102, 102, + 115, 101, 116, 95, 98, 97, + 99, 107, 0, 120, 101, 95, + 101, 100, 114, 97, 109, 95, + 100, 101, 112, 116, 104, 95, + 98, 97, 115, 101, 95, 100, + 119, 111, 114, 100, 115, 95, + 115, 99, 97, 108, 101, 100, + 0, 120, 101, 95, 101, 100, + 114, 97, 109, 95, 115, 116, + 101, 110, 99, 105, 108, 0, 1, 0, 19, 0, 1, 0, 4, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 19, 8, 0, 0, - 120, 101, 95, 116, 101, 120, - 116, 117, 114, 101, 115, 95, - 114, 101, 115, 111, 108, 118, - 101, 100, 0, 120, 101, 95, - 97, 108, 112, 104, 97, 95, - 116, 101, 115, 116, 95, 114, - 101, 102, 101, 114, 101, 110, - 99, 101, 0, 120, 101, 95, - 97, 108, 112, 104, 97, 95, - 116, 111, 95, 109, 97, 115, - 107, 0, 120, 101, 95, 101, - 100, 114, 97, 109, 95, 51, - 50, 98, 112, 112, 95, 116, - 105, 108, 101, 95, 112, 105, - 116, 99, 104, 95, 100, 119, - 111, 114, 100, 115, 95, 115, - 99, 97, 108, 101, 100, 0, - 120, 101, 95, 99, 111, 108, - 111, 114, 95, 101, 120, 112, - 95, 98, 105, 97, 115, 0, - 1, 0, 3, 0, 1, 0, + 0, 0, 37, 8, 0, 0, + 120, 101, 95, 101, 100, 114, + 97, 109, 95, 114, 116, 95, + 98, 97, 115, 101, 95, 100, + 119, 111, 114, 100, 115, 95, + 115, 99, 97, 108, 101, 100, + 0, 171, 1, 0, 19, 0, + 1, 0, 4, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 37, 8, + 0, 0, 120, 101, 95, 101, + 100, 114, 97, 109, 95, 114, + 116, 95, 102, 111, 114, 109, + 97, 116, 95, 102, 108, 97, + 103, 115, 0, 120, 101, 95, + 101, 100, 114, 97, 109, 95, + 114, 116, 95, 99, 108, 97, + 109, 112, 0, 171, 1, 0, + 3, 0, 1, 0, 4, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 172, 6, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 112, 111, 108, - 121, 95, 111, 102, 102, 115, - 101, 116, 95, 102, 114, 111, - 110, 116, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 112, 111, 108, 121, 95, 111, - 102, 102, 115, 101, 116, 95, - 98, 97, 99, 107, 0, 120, - 101, 95, 101, 100, 114, 97, - 109, 95, 100, 101, 112, 116, - 104, 95, 98, 97, 115, 101, - 95, 100, 119, 111, 114, 100, - 115, 95, 115, 99, 97, 108, - 101, 100, 0, 120, 101, 95, - 101, 100, 114, 97, 109, 95, - 115, 116, 101, 110, 99, 105, - 108, 0, 1, 0, 19, 0, - 1, 0, 4, 0, 2, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 19, 8, - 0, 0, 120, 101, 95, 101, - 100, 114, 97, 109, 95, 114, - 116, 95, 98, 97, 115, 101, - 95, 100, 119, 111, 114, 100, - 115, 95, 115, 99, 97, 108, - 101, 100, 0, 171, 1, 0, - 19, 0, 1, 0, 4, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 19, 8, 0, 0, 120, 101, + 172, 6, 0, 0, 120, 101, 95, 101, 100, 114, 97, 109, - 95, 114, 116, 95, 102, 111, - 114, 109, 97, 116, 95, 102, - 108, 97, 103, 115, 0, 120, - 101, 95, 101, 100, 114, 97, - 109, 95, 114, 116, 95, 99, - 108, 97, 109, 112, 0, 171, - 1, 0, 3, 0, 1, 0, - 4, 0, 4, 0, 0, 0, + 95, 114, 116, 95, 107, 101, + 101, 112, 95, 109, 97, 115, + 107, 0, 171, 171, 1, 0, + 19, 0, 1, 0, 4, 0, + 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 172, 6, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 114, 116, 95, - 107, 101, 101, 112, 95, 109, - 97, 115, 107, 0, 171, 171, - 1, 0, 19, 0, 1, 0, - 4, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 19, 8, 0, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 114, 116, 95, - 98, 108, 101, 110, 100, 95, - 102, 97, 99, 116, 111, 114, - 115, 95, 111, 112, 115, 0, - 120, 101, 95, 101, 100, 114, - 97, 109, 95, 98, 108, 101, - 110, 100, 95, 99, 111, 110, - 115, 116, 97, 110, 116, 0, - 77, 105, 99, 114, 111, 115, - 111, 102, 116, 32, 40, 82, - 41, 32, 72, 76, 83, 76, - 32, 83, 104, 97, 100, 101, - 114, 32, 67, 111, 109, 112, - 105, 108, 101, 114, 32, 49, - 48, 46, 49, 0, 171, 171, - 73, 83, 71, 78, 44, 0, - 0, 0, 1, 0, 0, 0, - 8, 0, 0, 0, 32, 0, - 0, 0, 0, 0, 0, 0, - 6, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 1, 1, 0, 0, 83, 86, - 95, 86, 101, 114, 116, 101, - 120, 73, 68, 0, 79, 83, + 37, 8, 0, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 114, 116, 95, 98, 108, + 101, 110, 100, 95, 102, 97, + 99, 116, 111, 114, 115, 95, + 111, 112, 115, 0, 120, 101, + 95, 101, 100, 114, 97, 109, + 95, 98, 108, 101, 110, 100, + 95, 99, 111, 110, 115, 116, + 97, 110, 116, 0, 77, 105, + 99, 114, 111, 115, 111, 102, + 116, 32, 40, 82, 41, 32, + 72, 76, 83, 76, 32, 83, + 104, 97, 100, 101, 114, 32, + 67, 111, 109, 112, 105, 108, + 101, 114, 32, 49, 48, 46, + 49, 0, 171, 171, 73, 83, 71, 78, 44, 0, 0, 0, 1, 0, 0, 0, 8, 0, 0, 0, 32, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 1, 14, - 0, 0, 88, 69, 86, 69, - 82, 84, 69, 88, 73, 68, - 0, 171, 83, 72, 69, 88, - 52, 2, 0, 0, 81, 0, - 1, 0, 141, 0, 0, 0, - 106, 8, 0, 1, 89, 0, - 0, 7, 70, 142, 48, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 0, - 0, 0, 96, 0, 0, 4, - 18, 16, 16, 0, 0, 0, - 0, 0, 6, 0, 0, 0, - 101, 0, 0, 3, 18, 32, - 16, 0, 0, 0, 0, 0, - 104, 0, 0, 2, 1, 0, - 0, 0, 32, 0, 0, 12, - 114, 0, 16, 0, 0, 0, - 0, 0, 6, 128, 48, 0, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 6, 0, 0, 0, 1, 0, 0, 0, - 2, 64, 0, 0, 1, 0, - 0, 0, 2, 0, 0, 0, + 0, 0, 0, 0, 1, 1, + 0, 0, 83, 86, 95, 86, + 101, 114, 116, 101, 120, 73, + 68, 0, 79, 83, 71, 78, + 44, 0, 0, 0, 1, 0, + 0, 0, 8, 0, 0, 0, + 32, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 60, 0, 0, 7, - 50, 0, 16, 0, 0, 0, - 0, 0, 150, 5, 16, 0, - 0, 0, 0, 0, 70, 0, + 0, 0, 1, 14, 0, 0, + 88, 69, 86, 69, 82, 84, + 69, 88, 73, 68, 0, 171, + 83, 72, 69, 88, 52, 2, + 0, 0, 81, 0, 1, 0, + 141, 0, 0, 0, 106, 8, + 0, 1, 89, 0, 0, 7, + 70, 142, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 96, 0, 0, 4, 18, 16, 16, 0, 0, 0, 0, 0, - 31, 0, 4, 3, 10, 0, + 6, 0, 0, 0, 101, 0, + 0, 3, 18, 32, 16, 0, + 0, 0, 0, 0, 104, 0, + 0, 2, 1, 0, 0, 0, + 32, 0, 0, 12, 114, 0, 16, 0, 0, 0, 0, 0, - 41, 0, 0, 7, 18, 0, + 6, 128, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 2, 64, + 0, 0, 1, 0, 0, 0, + 2, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 0, + 60, 0, 0, 7, 50, 0, 16, 0, 0, 0, 0, 0, - 10, 16, 16, 0, 0, 0, - 0, 0, 1, 64, 0, 0, - 8, 0, 0, 0, 85, 0, - 0, 7, 66, 0, 16, 0, + 150, 5, 16, 0, 0, 0, + 0, 0, 70, 0, 16, 0, + 0, 0, 0, 0, 31, 0, + 4, 3, 10, 0, 16, 0, + 0, 0, 0, 0, 41, 0, + 0, 7, 18, 0, 16, 0, 0, 0, 0, 0, 10, 16, 16, 0, 0, 0, 0, 0, 1, 64, 0, 0, 8, 0, - 0, 0, 1, 0, 0, 10, - 82, 0, 16, 0, 0, 0, - 0, 0, 6, 2, 16, 0, - 0, 0, 0, 0, 2, 64, - 0, 0, 0, 255, 0, 255, - 0, 0, 0, 0, 255, 0, - 255, 0, 0, 0, 0, 0, - 30, 0, 0, 7, 18, 0, - 16, 0, 0, 0, 0, 0, - 42, 0, 16, 0, 0, 0, - 0, 0, 10, 0, 16, 0, - 0, 0, 0, 0, 18, 0, - 0, 1, 54, 0, 0, 5, - 18, 0, 16, 0, 0, 0, - 0, 0, 10, 16, 16, 0, - 0, 0, 0, 0, 21, 0, - 0, 1, 31, 0, 4, 3, - 26, 0, 16, 0, 0, 0, 0, 0, 85, 0, 0, 7, - 34, 0, 16, 0, 0, 0, - 0, 0, 10, 0, 16, 0, + 66, 0, 16, 0, 0, 0, + 0, 0, 10, 16, 16, 0, + 0, 0, 0, 0, 1, 64, + 0, 0, 8, 0, 0, 0, + 1, 0, 0, 10, 82, 0, + 16, 0, 0, 0, 0, 0, + 6, 2, 16, 0, 0, 0, + 0, 0, 2, 64, 0, 0, + 0, 255, 0, 255, 0, 0, + 0, 0, 255, 0, 255, 0, + 0, 0, 0, 0, 30, 0, + 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 42, 0, + 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, + 0, 0, 18, 0, 0, 1, + 54, 0, 0, 5, 18, 0, + 16, 0, 0, 0, 0, 0, + 10, 16, 16, 0, 0, 0, + 0, 0, 21, 0, 0, 1, + 31, 0, 4, 3, 26, 0, + 16, 0, 0, 0, 0, 0, + 85, 0, 0, 7, 34, 0, + 16, 0, 0, 0, 0, 0, + 10, 0, 16, 0, 0, 0, + 0, 0, 1, 64, 0, 0, + 16, 0, 0, 0, 140, 0, + 0, 11, 18, 0, 16, 0, 0, 0, 0, 0, 1, 64, 0, 0, 16, 0, 0, 0, - 140, 0, 0, 11, 18, 0, - 16, 0, 0, 0, 0, 0, 1, 64, 0, 0, 16, 0, - 0, 0, 1, 64, 0, 0, - 16, 0, 0, 0, 10, 0, + 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 26, 0, 16, 0, 0, 0, 0, 0, - 26, 0, 16, 0, 0, 0, - 0, 0, 21, 0, 0, 1, - 30, 0, 0, 9, 18, 0, + 21, 0, 0, 1, 30, 0, + 0, 9, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 0, 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, - 0, 0, 26, 128, 48, 0, + 26, 128, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 1, 0, + 0, 7, 18, 0, 16, 0, + 0, 0, 0, 0, 10, 0, + 16, 0, 0, 0, 0, 0, + 1, 64, 0, 0, 255, 255, + 255, 0, 83, 0, 0, 9, + 18, 0, 16, 0, 0, 0, + 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 42, 128, + 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 84, 0, 0, 9, + 18, 0, 16, 0, 0, 0, + 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 58, 128, + 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, + 0, 0, 86, 0, 0, 5, + 18, 32, 16, 0, 0, 0, + 0, 0, 10, 0, 16, 0, + 0, 0, 0, 0, 62, 0, + 0, 1, 83, 84, 65, 84, + 148, 0, 0, 0, 20, 0, + 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 2, 0, + 0, 0, 0, 0, 0, 0, + 4, 0, 0, 0, 7, 0, + 0, 0, 2, 0, 0, 0, + 2, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, - 1, 0, 0, 7, 18, 0, - 16, 0, 0, 0, 0, 0, - 10, 0, 16, 0, 0, 0, - 0, 0, 1, 64, 0, 0, - 255, 255, 255, 0, 83, 0, - 0, 9, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, - 42, 128, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 84, 0, - 0, 9, 18, 0, 16, 0, - 0, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, - 58, 128, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 86, 0, - 0, 5, 18, 32, 16, 0, - 0, 0, 0, 0, 10, 0, - 16, 0, 0, 0, 0, 0, - 62, 0, 0, 1, 83, 84, - 65, 84, 148, 0, 0, 0, - 20, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, - 2, 0, 0, 0, 0, 0, - 0, 0, 4, 0, 0, 0, - 7, 0, 0, 0, 2, 0, - 0, 0, 2, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -696,5 +699,5 @@ const BYTE tessellation_indexed_vs[] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0 + 0, 0 }; diff --git a/src/xenia/gpu/shaders/primitive_point_list.gs.hlsl b/src/xenia/gpu/shaders/primitive_point_list.gs.hlsl index d5e7cbf14..b32f57fa2 100644 --- a/src/xenia/gpu/shaders/primitive_point_list.gs.hlsl +++ b/src/xenia/gpu/shaders/primitive_point_list.gs.hlsl @@ -1,35 +1,35 @@ #include "xenos_draw.hlsli" -// TODO(Triang3l): Figure out how to see which interpolator gets adjusted. - [maxvertexcount(4)] void main(point XeVertexPreGS xe_in[1], inout TriangleStream xe_stream) { - // TODO(Triang3l): Handle ps_ucp_mode. + // TODO(Triang3l): Handle ps_ucp_mode (transform the host clip space to the + // guest one, calculate the distances to the user clip planes, cull using the + // distance from the center for modes 0, 1 and 2, cull and clip per-vertex for + // modes 2 and 3). if (xe_in[0].cull_distance < 0.0 || any(isnan(xe_in[0].post_gs.position))) { return; } - // The vertex shader's header writes -1.0f to point_size by default, so any + // The vertex shader's header writes -1.0 to point_size by default, so any // non-negative value means that it was overwritten by the translated vertex - // shader. - float2 point_radius = xe_point_constant_radius; - float point_vertex_diameter = xe_in[0].post_gs.pre_ps.point_params.z; - if (point_vertex_diameter >= 0.0) { - // Already clamped in the vertex shader (combined with making it - // non-negative). - point_radius = point_vertex_diameter * 0.5; - } - if (!all(point_radius > 0.0)) { + // shader. The per-vertex diameter is already clamped in the vertex shader + // (combined with making it non-negative). + float point_vertex_diameter = xe_in[0].post_gs.pre_ps.point_parameters.z; + float2 point_screen_diameter = (point_vertex_diameter >= 0.0) + ? point_vertex_diameter + : xe_point_constant_diameter; + if (!all(point_screen_diameter > 0.0)) { // 4D5307F1 has zero-size snowflakes, drop them quicker. return; } - point_radius *= xe_point_screen_to_ndc; - point_radius *= xe_in[0].post_gs.position.w; + float2 point_clip_space_radius = + point_screen_diameter * xe_point_screen_diameter_to_ndc_radius * + xe_in[0].post_gs.position.w; XeVertexPostGS xe_out; xe_out.pre_ps.interpolators = xe_in[0].post_gs.pre_ps.interpolators; - xe_out.pre_ps.point_params.z = xe_in[0].post_gs.pre_ps.point_params.z; + xe_out.pre_ps.point_parameters.z = xe_in[0].post_gs.pre_ps.point_parameters.z; xe_out.position.zw = xe_in[0].post_gs.position.zw; // TODO(Triang3l): Handle ps_ucp_mode. xe_out.clip_distance_0123 = xe_in[0].post_gs.clip_distance_0123; @@ -43,19 +43,21 @@ void main(point XeVertexPreGS xe_in[1], // +|PsParamGen.y|). // TODO(Triang3l): On Vulkan, sign of Y needs to inverted because of the // upper-left origin. - xe_out.pre_ps.point_params.xy = float2(0.0, 0.0); + xe_out.pre_ps.point_parameters.xy = float2(0.0, 0.0); xe_out.position.xy = - xe_in[0].post_gs.position.xy + float2(-point_radius.x, point_radius.y); + xe_in[0].post_gs.position.xy + + float2(-point_clip_space_radius.x, point_clip_space_radius.y); xe_stream.Append(xe_out); - xe_out.pre_ps.point_params.xy = float2(0.0, 1.0); - xe_out.position.xy = xe_in[0].post_gs.position.xy - point_radius; + xe_out.pre_ps.point_parameters.xy = float2(0.0, 1.0); + xe_out.position.xy = xe_in[0].post_gs.position.xy - point_clip_space_radius; xe_stream.Append(xe_out); - xe_out.pre_ps.point_params.xy = float2(1.0, 0.0); - xe_out.position.xy = xe_in[0].post_gs.position.xy + point_radius; + xe_out.pre_ps.point_parameters.xy = float2(1.0, 0.0); + xe_out.position.xy = xe_in[0].post_gs.position.xy + point_clip_space_radius; xe_stream.Append(xe_out); - xe_out.pre_ps.point_params.xy = float2(1.0, 1.0); + xe_out.pre_ps.point_parameters.xy = float2(1.0, 1.0); xe_out.position.xy = - xe_in[0].post_gs.position.xy + float2(point_radius.x, -point_radius.y); + xe_in[0].post_gs.position.xy + + float2(point_clip_space_radius.x, -point_clip_space_radius.y); xe_stream.Append(xe_out); xe_stream.RestartStrip(); } diff --git a/src/xenia/gpu/shaders/primitive_rectangle_list.gs.hlsl b/src/xenia/gpu/shaders/primitive_rectangle_list.gs.hlsl index 13d16d60d..b76bb224f 100644 --- a/src/xenia/gpu/shaders/primitive_rectangle_list.gs.hlsl +++ b/src/xenia/gpu/shaders/primitive_rectangle_list.gs.hlsl @@ -85,10 +85,10 @@ void main(triangle XeVertexPreGS xe_in[3], v3_signs.y * xe_in[1].post_gs.pre_ps.interpolators[i] + v3_signs.z * xe_in[2].post_gs.pre_ps.interpolators[i]; } - xe_out.pre_ps.point_params = - v3_signs.x * xe_in[0].post_gs.pre_ps.point_params + - v3_signs.y * xe_in[1].post_gs.pre_ps.point_params + - v3_signs.z * xe_in[2].post_gs.pre_ps.point_params; + xe_out.pre_ps.point_parameters = + v3_signs.x * xe_in[0].post_gs.pre_ps.point_parameters + + v3_signs.y * xe_in[1].post_gs.pre_ps.point_parameters + + v3_signs.z * xe_in[2].post_gs.pre_ps.point_parameters; xe_out.position = v3_signs.x * xe_in[0].post_gs.position + v3_signs.y * xe_in[1].post_gs.position + v3_signs.z * xe_in[2].post_gs.position; diff --git a/src/xenia/gpu/shaders/xenos_draw.hlsli b/src/xenia/gpu/shaders/xenos_draw.hlsli index 2087c0f3e..53843e83e 100644 --- a/src/xenia/gpu/shaders/xenos_draw.hlsli +++ b/src/xenia/gpu/shaders/xenos_draw.hlsli @@ -18,8 +18,8 @@ cbuffer xe_system_cbuffer : register(b0) { float3 xe_ndc_offset; float xe_point_vertex_diameter_max; - float2 xe_point_constant_radius; - float2 xe_point_screen_to_ndc; + float2 xe_point_constant_diameter; + float2 xe_point_screen_diameter_to_ndc_radius; uint xe_interpolator_sampling_pattern; uint xe_ps_param_gen; @@ -70,7 +70,7 @@ struct XeHSControlPointOutput { struct XeVertexPrePS { float4 interpolators[16] : TEXCOORD0; - float3 point_params : TEXCOORD16; + float3 point_parameters : TEXCOORD16; }; struct XeVertexPostGS {