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

[Vulkan] Include Vulkan Android header and fix some warnings

This commit is contained in:
Triang3l 2020-11-19 11:38:20 +03:00
parent a94301d967
commit 1e818dca4b
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/gpu/vulkan/vulkan_command_processor.cc
View File

@ -493,7 +493,7 @@ VulkanCommandProcessor::GetPipelineLayout(uint32_t texture_count_pixel,
"Failed to create a Vulkan descriptor set layout for {} combined " "Failed to create a Vulkan descriptor set layout for {} combined "
"images and samplers for guest pixel shaders", "images and samplers for guest pixel shaders",
texture_count_pixel); texture_count_pixel);
return false; return nullptr;
} }
descriptor_set_layouts_textures_.emplace( descriptor_set_layouts_textures_.emplace(
texture_descriptor_set_layout_key.key, texture_descriptor_set_layout_key.key,
@ -536,7 +536,7 @@ VulkanCommandProcessor::GetPipelineLayout(uint32_t texture_count_pixel,
"Failed to create a Vulkan descriptor set layout for {} combined " "Failed to create a Vulkan descriptor set layout for {} combined "
"images and samplers for guest vertex shaders", "images and samplers for guest vertex shaders",
texture_count_vertex); texture_count_vertex);
return false; return nullptr;
} }
descriptor_set_layouts_textures_.emplace( descriptor_set_layouts_textures_.emplace(
texture_descriptor_set_layout_key.key, texture_descriptor_set_layout_key.key,
@ -588,7 +588,7 @@ VulkanCommandProcessor::GetPipelineLayout(uint32_t texture_count_pixel,
"Failed to create a Vulkan pipeline layout for guest drawing with {} " "Failed to create a Vulkan pipeline layout for guest drawing with {} "
"pixel shader and {} vertex shader textures", "pixel shader and {} vertex shader textures",
texture_count_pixel, texture_count_vertex); texture_count_pixel, texture_count_vertex);
return false; return nullptr;
} }
PipelineLayout pipeline_layout_entry; PipelineLayout pipeline_layout_entry;
pipeline_layout_entry.pipeline_layout = pipeline_layout; pipeline_layout_entry.pipeline_layout = pipeline_layout;
@ -1650,7 +1650,7 @@ uint8_t* VulkanCommandProcessor::WriteUniformBufferBinding(
provider.device_properties().limits.minUniformBufferOffsetAlignment), provider.device_properties().limits.minUniformBufferOffsetAlignment),
descriptor_buffer_info_out.buffer, descriptor_buffer_info_out.offset); descriptor_buffer_info_out.buffer, descriptor_buffer_info_out.offset);
if (!mapping) { if (!mapping) {
return false; return nullptr;
} }
descriptor_buffer_info_out.range = VkDeviceSize(size); descriptor_buffer_info_out.range = VkDeviceSize(size);
write_descriptor_set_out.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; write_descriptor_set_out.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;

2
src/xenia/gpu/vulkan/vulkan_shared_memory.cc
View File

@ -467,6 +467,8 @@ void VulkanSharedMemory::GetBarrier(Usage usage,
stage_mask = VK_PIPELINE_STAGE_TRANSFER_BIT; stage_mask = VK_PIPELINE_STAGE_TRANSFER_BIT;
access_mask = VK_ACCESS_TRANSFER_WRITE_BIT; access_mask = VK_ACCESS_TRANSFER_WRITE_BIT;
return; return;
default:
break;
} }
stage_mask = VK_PIPELINE_STAGE_VERTEX_INPUT_BIT | stage_mask = VK_PIPELINE_STAGE_VERTEX_INPUT_BIT |
VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |

6
src/xenia/ui/vulkan/vulkan_provider.h
View File

@ -19,7 +19,11 @@
#include "xenia/base/platform.h" #include "xenia/base/platform.h"
#include "xenia/ui/graphics_provider.h" #include "xenia/ui/graphics_provider.h"
#if XE_PLATFORM_WIN32 #if XE_PLATFORM_ANDROID
#ifndef VK_USE_PLATFORM_ANDROID_KHR
#define VK_USE_PLATFORM_ANDROID_KHR 1
#endif
#elif XE_PLATFORM_WIN32
// Must be included before vulkan.h with VK_USE_PLATFORM_WIN32_KHR because it // Must be included before vulkan.h with VK_USE_PLATFORM_WIN32_KHR because it
// includes Windows.h too. // includes Windows.h too.
#include "xenia/base/platform_win.h" #include "xenia/base/platform_win.h"