ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[GPU] Separate GetHostViewportInfo X and Y bounds

This commit is contained in:
Triang3l 2020-11-18 12:27:36 +03:00
parent 49dc0e9c39
commit 99bb82fd1c
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/xenia/gpu/d3d12/d3d12_command_processor.cc
View File

@ -2016,7 +2016,8 @@ bool D3D12CommandProcessor::IssueDraw(xenos::PrimitiveType primitive_type,
} }
draw_util::ViewportInfo viewport_info; draw_util::ViewportInfo viewport_info;
draw_util::GetHostViewportInfo(regs, float(pixel_size_x), float(pixel_size_y), draw_util::GetHostViewportInfo(regs, float(pixel_size_x), float(pixel_size_y),
true, float(D3D12_VIEWPORT_BOUNDS_MAX), false, true, float(D3D12_VIEWPORT_BOUNDS_MAX),
float(D3D12_VIEWPORT_BOUNDS_MAX), false,
viewport_info); viewport_info);
draw_util::Scissor scissor; draw_util::Scissor scissor;
draw_util::GetScissor(regs, scissor); draw_util::GetScissor(regs, scissor);

17
src/xenia/gpu/draw_util.cc
View File

@ -113,11 +113,12 @@ int32_t FloatToD3D11Fixed16p8(float f32) {
void GetHostViewportInfo(const RegisterFile& regs, float pixel_size_x, void GetHostViewportInfo(const RegisterFile& regs, float pixel_size_x,
float pixel_size_y, bool origin_bottom_left, float pixel_size_y, bool origin_bottom_left,
float xy_max, bool allow_reverse_z, float x_max, float y_max, bool allow_reverse_z,
ViewportInfo& viewport_info_out) { ViewportInfo& viewport_info_out) {
assert_true(pixel_size_x >= 1.0f); assert_true(pixel_size_x >= 1.0f);
assert_true(pixel_size_y >= 1.0f); assert_true(pixel_size_y >= 1.0f);
assert_true(xy_max >= 1.0f); assert_true(x_max >= 1.0f);
assert_true(y_max >= 1.0f);
// PA_CL_VTE_CNTL contains whether offsets and scales are enabled. // PA_CL_VTE_CNTL contains whether offsets and scales are enabled.
// http://www.x.org/docs/AMD/old/evergreen_3D_registers_v2.pdf // http://www.x.org/docs/AMD/old/evergreen_3D_registers_v2.pdf
@ -167,9 +168,9 @@ void GetHostViewportInfo(const RegisterFile& regs, float pixel_size_x,
// Keep the viewport in the positive quarter-plane for simplicity of // Keep the viewport in the positive quarter-plane for simplicity of
// clamping to the maximum supported bounds. // clamping to the maximum supported bounds.
float cutoff_left = std::fmax(-viewport_left, 0.0f); float cutoff_left = std::fmax(-viewport_left, 0.0f);
float cutoff_right = std::fmax(viewport_right - xy_max, 0.0f); float cutoff_right = std::fmax(viewport_right - x_max, 0.0f);
viewport_left = std::fmax(viewport_left, 0.0f); viewport_left = std::fmax(viewport_left, 0.0f);
viewport_right = std::fmin(viewport_right, xy_max); viewport_right = std::fmin(viewport_right, x_max);
viewport_width = viewport_right - viewport_left; viewport_width = viewport_right - viewport_left;
if (viewport_width > size_min) { if (viewport_width > size_min) {
ndc_scale_x = ndc_scale_x =
@ -194,7 +195,7 @@ void GetHostViewportInfo(const RegisterFile& regs, float pixel_size_x,
// enabled, via the shader. // enabled, via the shader.
viewport_left = 0.0f; viewport_left = 0.0f;
viewport_width = std::min( viewport_width = std::min(
float(xenos::kTexture2DCubeMaxWidthHeight) * pixel_size_x, xy_max); float(xenos::kTexture2DCubeMaxWidthHeight) * pixel_size_x, x_max);
ndc_scale_x = (2.0f * pixel_size_x) / viewport_width; ndc_scale_x = (2.0f * pixel_size_x) / viewport_width;
ndc_offset_x = viewport_offset_x * ndc_scale_x - 1.0f; ndc_offset_x = viewport_offset_x * ndc_scale_x - 1.0f;
} }
@ -205,9 +206,9 @@ void GetHostViewportInfo(const RegisterFile& regs, float pixel_size_x,
viewport_top = viewport_offset_y * pixel_size_y - viewport_scale_y_abs; viewport_top = viewport_offset_y * pixel_size_y - viewport_scale_y_abs;
float viewport_bottom = viewport_top + viewport_scale_y_abs * 2.0f; float viewport_bottom = viewport_top + viewport_scale_y_abs * 2.0f;
float cutoff_top = std::fmax(-viewport_top, 0.0f); float cutoff_top = std::fmax(-viewport_top, 0.0f);
float cutoff_bottom = std::fmax(viewport_bottom - xy_max, 0.0f); float cutoff_bottom = std::fmax(viewport_bottom - y_max, 0.0f);
viewport_top = std::fmax(viewport_top, 0.0f); viewport_top = std::fmax(viewport_top, 0.0f);
viewport_bottom = std::fmin(viewport_bottom, xy_max); viewport_bottom = std::fmin(viewport_bottom, y_max);
viewport_height = viewport_bottom - viewport_top; viewport_height = viewport_bottom - viewport_top;
if (viewport_height > size_min) { if (viewport_height > size_min) {
ndc_scale_y = ndc_scale_y =
@ -227,7 +228,7 @@ void GetHostViewportInfo(const RegisterFile& regs, float pixel_size_x,
} }
} else { } else {
viewport_height = std::min( viewport_height = std::min(
float(xenos::kTexture2DCubeMaxWidthHeight) * pixel_size_y, xy_max); float(xenos::kTexture2DCubeMaxWidthHeight) * pixel_size_y, y_max);
ndc_scale_y = (2.0f * pixel_size_y) / viewport_height; ndc_scale_y = (2.0f * pixel_size_y) / viewport_height;
ndc_offset_y = viewport_offset_y * ndc_scale_y - 1.0f; ndc_offset_y = viewport_offset_y * ndc_scale_y - 1.0f;
} }

2
src/xenia/gpu/draw_util.h
View File

@ -52,7 +52,7 @@ struct ViewportInfo {
// Direct3D clip space with 0...W Z rather than -W...W. // Direct3D clip space with 0...W Z rather than -W...W.
void GetHostViewportInfo(const RegisterFile& regs, float pixel_size_x, void GetHostViewportInfo(const RegisterFile& regs, float pixel_size_x,
float pixel_size_y, bool origin_bottom_left, float pixel_size_y, bool origin_bottom_left,
float xy_max, bool allow_reverse_z, float x_max, float y_max, bool allow_reverse_z,
ViewportInfo& viewport_info_out); ViewportInfo& viewport_info_out);
struct Scissor { struct Scissor {