Merge branch 'master' into d3d12

This commit is contained in:
Triang3l 2019-03-03 14:42:11 +03:00
commit 05c1f57007
3 changed files with 3 additions and 3 deletions

View File

@ -17,7 +17,7 @@ video drivers for your card.
Ensure Python is in your PATH. Ensure Python is in your PATH.
I recommend using [Cmder](http://cmder.net/) for git and command I recommend using [Cmder](https://cmder.net/) for git and command
line usage. line usage.
#### Debugging #### Debugging

View File

@ -31,7 +31,7 @@ waiting for a fixed 60hz timer.
### Vulkan ### Vulkan
See the top of [src/xenia/gpu/vulkan/vulkan_gpu_flags.cc](../src/xenia/vulkan/vulkan_gpu_flags.cc). See the top of [src/xenia/gpu/vulkan/vulkan_gpu_flags.cc](../src/xenia/gpu/vulkan/vulkan_gpu_flags.cc).
`vulkan_dump_disasm=true` "Dump shader disassembly. NVIDIA only supported." `vulkan_dump_disasm=true` "Dump shader disassembly. NVIDIA only supported."

View File

@ -360,7 +360,7 @@ void CommandProcessor::MakeCoherent() {
} }
const char* action = "N/A"; const char* action = "N/A";
if (status_host & 0x03000000) { if ((status_host & 0x03000000) == 0x03000000) {
action = "VC | TC"; action = "VC | TC";
} else if (status_host & 0x02000000) { } else if (status_host & 0x02000000) {
action = "TC"; action = "TC";