Merge branch 'vulkan'

2016-06-11 19:23:23 -05:00
parent 32011a841e 323b993bbc
commit 841f6fe239
164 changed files with 51895 additions and 4707 deletions
--- a/src/xenia/gpu/gl4/gl4_command_processor.cc
+++ b/src/xenia/gpu/gl4/gl4_command_processor.cc
@@ -1410,7 +1410,7 @@ GL4CommandProcessor::UpdateStatus GL4CommandProcessor::PopulateVertexBuffers() {
      // as we copy and only if it differs from the previous value committing
      // it (and if it matches just discard and reuse).
      xe::copy_and_swap_32_aligned(
-          reinterpret_cast<uint32_t*>(allocation.host_ptr),
+          allocation.host_ptr,
          memory_->TranslatePhysical<const uint32_t*>(fetch->address << 2),
          valid_range / 4);