mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2024-11-26 20:50:40 +00:00
hotfix2: Actually fix errors
Ahhhh
This commit is contained in:
parent
cf342e7a4b
commit
ebebafed64
@ -259,22 +259,6 @@ TileManager::TileManager(const Vulkan::Instance& instance, Vulkan::Scheduler& sc
|
||||
HostShaders::DETILE_M32X4_COMP,
|
||||
};
|
||||
|
||||
for (int pl_id = 0; pl_id < DetilerType::Max; ++pl_id) {
|
||||
auto& ctx = detilers[pl_id];
|
||||
|
||||
const auto& module = Vulkan::Compile(
|
||||
detiler_shaders[pl_id], vk::ShaderStageFlagBits::eCompute, instance.GetDevice());
|
||||
|
||||
// Set module debug name
|
||||
auto module_name = magic_enum::enum_name(static_cast<DetilerType>(pl_id));
|
||||
Vulkan::SetObjectName(instance.GetDevice(), module, module_name);
|
||||
|
||||
const vk::PipelineShaderStageCreateInfo shader_ci = {
|
||||
.stage = vk::ShaderStageFlagBits::eCompute,
|
||||
.module = module,
|
||||
.pName = "main",
|
||||
};
|
||||
|
||||
boost::container::static_vector<vk::DescriptorSetLayoutBinding, 2> bindings{
|
||||
{
|
||||
.binding = 0,
|
||||
@ -295,8 +279,7 @@ TileManager::TileManager(const Vulkan::Instance& instance, Vulkan::Scheduler& sc
|
||||
.bindingCount = static_cast<u32>(bindings.size()),
|
||||
.pBindings = bindings.data(),
|
||||
};
|
||||
auto desc_layout_result =
|
||||
instance.GetDevice().createDescriptorSetLayoutUnique(desc_layout_ci);
|
||||
auto desc_layout_result = instance.GetDevice().createDescriptorSetLayoutUnique(desc_layout_ci);
|
||||
ASSERT_MSG(desc_layout_result.result == vk::Result::eSuccess,
|
||||
"Failed to create descriptor set layout: {}",
|
||||
vk::to_string(desc_layout_result.result));
|
||||
@ -308,6 +291,22 @@ TileManager::TileManager(const Vulkan::Instance& instance, Vulkan::Scheduler& sc
|
||||
.size = sizeof(DetilerParams),
|
||||
};
|
||||
|
||||
for (int pl_id = 0; pl_id < DetilerType::Max; ++pl_id) {
|
||||
auto& ctx = detilers[pl_id];
|
||||
|
||||
const auto& module = Vulkan::Compile(
|
||||
detiler_shaders[pl_id], vk::ShaderStageFlagBits::eCompute, instance.GetDevice());
|
||||
|
||||
// Set module debug name
|
||||
auto module_name = magic_enum::enum_name(static_cast<DetilerType>(pl_id));
|
||||
Vulkan::SetObjectName(instance.GetDevice(), module, module_name);
|
||||
|
||||
const vk::PipelineShaderStageCreateInfo shader_ci = {
|
||||
.stage = vk::ShaderStageFlagBits::eCompute,
|
||||
.module = module,
|
||||
.pName = "main",
|
||||
};
|
||||
|
||||
const vk::DescriptorSetLayout set_layout = *desc_layout;
|
||||
const vk::PipelineLayoutCreateInfo layout_info = {
|
||||
.setLayoutCount = 1U,
|
||||
|
Loading…
Reference in New Issue
Block a user