[Bf-blender-cvs] [b6214836599] master: GPU: Fix incorrect attribute usage in vk_shader.
Jeroen Bakker
noreply at git.blender.org
Wed Dec 21 21:19:31 CET 2022
Commit: b62148365996afe177a7c1b732f0167a920e16a4
Author: Jeroen Bakker
Date: Wed Dec 21 21:19:23 2022 +0100
Branches: master
https://developer.blender.org/rBb62148365996afe177a7c1b732f0167a920e16a4
GPU: Fix incorrect attribute usage in vk_shader.
Detected when reviewing the code. Just wanted it to be in
master before holiday season starts.
===================================================================
M source/blender/gpu/vulkan/vk_shader.cc
===================================================================
diff --git a/source/blender/gpu/vulkan/vk_shader.cc b/source/blender/gpu/vulkan/vk_shader.cc
index 40408759679..cf05cf13d23 100644
--- a/source/blender/gpu/vulkan/vk_shader.cc
+++ b/source/blender/gpu/vulkan/vk_shader.cc
@@ -610,7 +610,7 @@ void VKShader::build_shader_module(MutableSpan<const char *> sources,
"Only forced ShaderC shader kinds are supported.");
sources[0] = glsl_patch_get();
Vector<uint32_t> spirv_module = compile_glsl_to_spirv(sources, stage);
- build_shader_module(spirv_module, &compute_module_);
+ build_shader_module(spirv_module, r_shader_module);
}
void VKShader::vertex_shader_from_glsl(MutableSpan<const char *> sources)
@@ -674,7 +674,7 @@ bool VKShader::finalize(const shader::ShaderCreateInfo * /*info*/)
VkPipelineShaderStageCreateInfo compute_stage_info = {};
compute_stage_info.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO;
compute_stage_info.stage = VK_SHADER_STAGE_GEOMETRY_BIT;
- compute_stage_info.module = geometry_module_;
+ compute_stage_info.module = compute_module_;
compute_stage_info.pName = "main";
pipeline_infos_.append(compute_stage_info);
}
More information about the Bf-blender-cvs
mailing list