fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental

Browse Source
This commit is contained in:
Gliniak
2022-07-17 21:27:52 +02:00
parent 23ca3725c4 14fdf4b270
commit 6e1e62378f
169 changed files with 39917 additions and 37685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1342,8 +1342,7 @@ bool D3D12RenderTargetCache::Resolve(const Memory& memory,
}
// Nothing to copy/clear.
if (!resolve_info.coordinate_info.width_div_8 ||
!resolve_info.coordinate_info.height_div_8) {
if (!resolve_info.coordinate_info.width_div_8 || !resolve_info.height_div_8) {
return true;
}

5
src/xenia/gpu/d3d12/d3d12_texture_cache.cc
View File

@@ -1840,10 +1840,13 @@ bool D3D12TextureCache::LoadTextureDataFromResidentMemoryImpl(Texture& texture,
auto& cbuffer_pool = command_processor_.GetConstantBufferPool();
LoadConstants load_constants;
// 3 bits for each.
assert_true(texture_resolution_scale_x <= 7);
assert_true(texture_resolution_scale_y <= 7);
load_constants.is_tiled_3d_endian_scale =
uint32_t(texture_key.tiled) | (uint32_t(is_3d) << 1) |
(uint32_t(texture_key.endianness) << 2) |
(texture_resolution_scale_x << 4) | (texture_resolution_scale_y << 6);
(texture_resolution_scale_x << 4) | (texture_resolution_scale_y << 7);
// The loop is slices within levels because the base and the levels may need
// different portions of the scaled resolve virtual address space to be

2
src/xenia/gpu/d3d12/premake5.lua
View File

@@ -22,7 +22,7 @@ project("xenia-gpu-d3d12")
group("src")
project("xenia-gpu-d3d12-trace-viewer")
uuid("7b5b9fcb-7bf1-43ff-a774-d4c41c8706be")
kind("WindowedApp")
single_library_windowed_app_kind()
language("C++")
links({
"xenia-apu",