griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: Vulkan: Use VKDevice& in finalize_pipeline_layout

Browse Source 
!139630 requires the VKDevice to access the device function pointers.
This commit is contained in:
Jeroen Bakker
2025-06-03 10:49:14 +02:00
parent 3a875b2910
commit e91e8eef41
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/gpu/vulkan/vk_shader.cc
View File

@@ -617,7 +617,7 @@ bool VKShader::finalize(const shader::ShaderCreateInfo *info)
if (!finalize_descriptor_set_layouts(device, vk_interface)) {
return false;
}
if (!finalize_pipeline_layout(device.vk_handle(), vk_interface)) {
if (!finalize_pipeline_layout(device, vk_interface)) {
return false;
}
@@ -682,7 +682,7 @@ bool VKShader::is_ready() const
return compilation_finished;
}
bool VKShader::finalize_pipeline_layout(VkDevice vk_device,
bool VKShader::finalize_pipeline_layout(VKDevice &device,
const VKShaderInterface &shader_interface)
{
const uint32_t layout_count = vk_descriptor_set_layout_ == VK_NULL_HANDLE ? 0 : 1;
@@ -705,7 +705,7 @@ bool VKShader::finalize_pipeline_layout(VkDevice vk_device,
pipeline_info.pPushConstantRanges = &push_constant_range;
}
if (vkCreatePipelineLayout(vk_device, &pipeline_info, nullptr, &vk_pipeline_layout) !=
if (vkCreatePipelineLayout(device.vk_handle(), &pipeline_info, nullptr, &vk_pipeline_layout) !=
VK_SUCCESS)
{
return false;

2
source/blender/gpu/vulkan/vk_shader.hh
View File

@@ -122,7 +122,7 @@ class VKShader : public Shader {
bool finalize_shader_module(VKShaderModule &shader_module, const char *stage_name);
bool finalize_descriptor_set_layouts(VKDevice &vk_device,
const VKShaderInterface &shader_interface);
bool finalize_pipeline_layout(VkDevice vk_device, const VKShaderInterface &shader_interface);
bool finalize_pipeline_layout(VKDevice &device, const VKShaderInterface &shader_interface);
/**
* \brief features available on newer implementation such as native barycentric coordinates