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

[Vulkan] Halve the viewport dimensions when viewport scaling is disabled (10240 -> 5120) 

The negative part of the viewport is unused, so hijack the 2 unused parameters of the window scale to use as an offset
This commit is contained in:
DrChat 2018-04-16 12:54:50 -05:00
parent 25f93a171c
commit b90465e2e5
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/xenia/gpu/spirv_shader_translator.cc
View File

@ -532,8 +532,16 @@ std::vector<uint8_t> SpirvShaderTranslator::CompleteTranslation() {
// pos.xy *= window_scale.xy // pos.xy *= window_scale.xy
auto p_scaled = auto p_scaled =
b.createBinOp(spv::Op::OpFMul, vec4_float_type_, p, window_scale); b.createBinOp(spv::Op::OpFMul, vec4_float_type_, p, window_scale);
// Apply window offset
// pos.xy += window_scale.zw
auto window_offset = b.createOp(spv::Op::OpVectorShuffle, vec4_float_type_,
{window_scale, window_scale, 2, 3, 0, 1});
auto p_offset = b.createBinOp(spv::Op::OpFAdd, vec4_float_type_, p_scaled,
window_offset);
p = b.createOp(spv::Op::OpVectorShuffle, vec4_float_type_, p = b.createOp(spv::Op::OpVectorShuffle, vec4_float_type_,
{p, p_scaled, 4, 5, 2, 3}); {p, p_offset, 4, 5, 2, 3});
b.createStore(p, pos_); b.createStore(p, pos_);
} else { } else {

16
src/xenia/gpu/vulkan/pipeline_cache.cc
View File

@ -674,10 +674,11 @@ bool PipelineCache::SetDynamicState(VkCommandBuffer command_buffer,
vpx = window_width_scalar * vox - vpw / 2 + vtx_window_offset_x; vpx = window_width_scalar * vox - vpw / 2 + vtx_window_offset_x;
vpy = window_height_scalar * voy - vph / 2 + vtx_window_offset_y; vpy = window_height_scalar * voy - vph / 2 + vtx_window_offset_y;
} else { } else {
vpw = 2 * 2560.0f * window_width_scalar; // TODO(DrChat): This should be the width/height of the target picture
vph = 2 * 2560.0f * window_height_scalar; vpw = 2560.0f * window_width_scalar;
vpx = -2560.0f * window_width_scalar + vtx_window_offset_x; vph = 2560.0f * window_height_scalar;
vpy = -2560.0f * window_height_scalar + vtx_window_offset_y; vpx = vtx_window_offset_x;
vpy = vtx_window_offset_y;
} }
if (viewport_state_dirty) { if (viewport_state_dirty) {
@ -776,12 +777,15 @@ bool PipelineCache::SetDynamicState(VkCommandBuffer command_buffer,
if (vport_xscale_enable) { if (vport_xscale_enable) {
push_constants.window_scale[0] = 1.0f; push_constants.window_scale[0] = 1.0f;
push_constants.window_scale[1] = -1.0f; push_constants.window_scale[1] = -1.0f;
push_constants.window_scale[2] = 0.f;
push_constants.window_scale[3] = 0.f;
} else { } else {
// 1 / unscaled viewport w/h
push_constants.window_scale[0] = 1.0f / 2560.0f; push_constants.window_scale[0] = 1.0f / 2560.0f;
push_constants.window_scale[1] = 1.0f / 2560.0f; push_constants.window_scale[1] = 1.0f / 2560.0f;
push_constants.window_scale[2] = -1.f;
push_constants.window_scale[3] = -1.f;
} }
push_constants.window_scale[2] = vpw;
push_constants.window_scale[3] = vph;
// http://www.x.org/docs/AMD/old/evergreen_3D_registers_v2.pdf // http://www.x.org/docs/AMD/old/evergreen_3D_registers_v2.pdf
// VTX_XY_FMT = true: the incoming XY have already been multiplied by 1/W0. // VTX_XY_FMT = true: the incoming XY have already been multiplied by 1/W0.