Merge branch 'master' into vulkan

2022-02-03 21:12:10 +03:00
parent 39890bab6f 7977d7ab98
commit 922efb13ce
501 changed files with 56183 additions and 10196 deletions
--- a/src/xenia/gpu/vulkan/vulkan_pipeline_cache.h
+++ b/src/xenia/gpu/vulkan/vulkan_pipeline_cache.h
@@ -61,12 +61,10 @@ class VulkanPipelineCache {

  // Retrieves the shader modification for the current state. The shader must
  // have microcode analyzed.
-  SpirvShaderTranslator::Modification
-  VulkanPipelineCache::GetCurrentVertexShaderModification(
+  SpirvShaderTranslator::Modification GetCurrentVertexShaderModification(
      const Shader& shader,
      Shader::HostVertexShaderType host_vertex_shader_type) const;
-  SpirvShaderTranslator::Modification
-  VulkanPipelineCache::GetCurrentPixelShaderModification(
+  SpirvShaderTranslator::Modification GetCurrentPixelShaderModification(
      const Shader& shader) const;

  // TODO(Triang3l): Return a deferred creation handle.