prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix vulkan VkPipelineShaderStageCreateInfo

Browse Source
This commit is contained in:
David Marcec
2020-09-20 17:54:54 +10:00
parent 35795a042c
commit e6266bb49f
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/renderer_vulkan/vk_blit_screen.cpp
View File

@@ -529,7 +529,7 @@ void VKBlitScreen::CreateGraphicsPipeline() {
.pNext = nullptr, .pNext = nullptr,
.flags = 0, .flags = 0,
.stage = VK_SHADER_STAGE_VERTEX_BIT, .stage = VK_SHADER_STAGE_VERTEX_BIT,
.shader_module = *vertex_shader, .vkModule = *vertex_shader,
.pName = "main", .pName = "main",
.pSpecializationInfo = nullptr, .pSpecializationInfo = nullptr,
}, },
@@ -538,7 +538,7 @@ void VKBlitScreen::CreateGraphicsPipeline() {
.pNext = nullptr, .pNext = nullptr,
.flags = 0, .flags = 0,
.stage = VK_SHADER_STAGE_FRAGMENT_BIT, .stage = VK_SHADER_STAGE_FRAGMENT_BIT,
.shader_module = *fragment_shader, .vkModule = *fragment_shader,
.pName = "main", .pName = "main",
.pSpecializationInfo = nullptr, .pSpecializationInfo = nullptr,
}, },

2
src/video_core/renderer_vulkan/vk_compute_pass.cpp
View File

@@ -436,7 +436,7 @@ VKComputePass::VKComputePass(const VKDevice& device, VKDescriptorPool& descripto
.pNext = nullptr, .pNext = nullptr,
.flags = 0, .flags = 0,
.stage = VK_SHADER_STAGE_COMPUTE_BIT, .stage = VK_SHADER_STAGE_COMPUTE_BIT,
.shader_module = *shader_module, .vkModule = *shader_module,
.pName = "main", .pName = "main",
.pSpecializationInfo = nullptr, .pSpecializationInfo = nullptr,
}, },

2
src/video_core/renderer_vulkan/vk_compute_pipeline.cpp
View File

@@ -128,7 +128,7 @@ vk::Pipeline VKComputePipeline::CreatePipeline() const {
.pNext = nullptr, .pNext = nullptr,
.flags = 0, .flags = 0,
.stage = VK_SHADER_STAGE_COMPUTE_BIT, .stage = VK_SHADER_STAGE_COMPUTE_BIT,
.shader_module = *shader_module, .vkModule = *shader_module,
.pName = "main", .pName = "main",
.pSpecializationInfo = nullptr, .pSpecializationInfo = nullptr,
}, },

2
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View File

@@ -438,7 +438,7 @@ vk::Pipeline VKGraphicsPipeline::CreatePipeline(const RenderPassParams& renderpa
stage_ci.pNext = nullptr; stage_ci.pNext = nullptr;
stage_ci.flags = 0; stage_ci.flags = 0;
stage_ci.stage = MaxwellToVK::ShaderStage(static_cast<Tegra::Engines::ShaderType>(stage)); stage_ci.stage = MaxwellToVK::ShaderStage(static_cast<Tegra::Engines::ShaderType>(stage));
stage_ci.shader_module = *modules[module_index++]; stage_ci.module = *modules[module_index++];
stage_ci.pName = "main"; stage_ci.pName = "main";
stage_ci.pSpecializationInfo = nullptr; stage_ci.pSpecializationInfo = nullptr;

2
src/video_core/renderer_vulkan/wrapper.h
View File

@@ -14,7 +14,9 @@
#include <vector> #include <vector>
#define VK_NO_PROTOTYPES #define VK_NO_PROTOTYPES
#define module vkModule
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#undef module
#include "common/common_types.h" #include "common/common_types.h"