Vulkan: Add a create shader helper.

src/libANGLE/renderer/vulkan/ProgramVk.cpp

@@ -243,29 +243,10 @@ gl::LinkResult ProgramVk::link(const gl::Context *glContext,
         return false;
     }
 
-    {
-        VkShaderModuleCreateInfo vertexShaderInfo;
-        vertexShaderInfo.sType    = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
-        vertexShaderInfo.pNext    = nullptr;
-        vertexShaderInfo.flags    = 0;
-        vertexShaderInfo.codeSize = vertexCode.size() * sizeof(uint32_t);
-        vertexShaderInfo.pCode    = vertexCode.data();
-
-        ANGLE_TRY(mDefaultVertexShaderAndSerial.get().init(contextVk, vertexShaderInfo));
-        mDefaultVertexShaderAndSerial.updateSerial(renderer->issueShaderSerial());
-    }
-
-    {
-        VkShaderModuleCreateInfo fragmentShaderInfo;
-        fragmentShaderInfo.sType    = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
-        fragmentShaderInfo.pNext    = nullptr;
-        fragmentShaderInfo.flags    = 0;
-        fragmentShaderInfo.codeSize = fragmentCode.size() * sizeof(uint32_t);
-        fragmentShaderInfo.pCode    = fragmentCode.data();
-
-        ANGLE_TRY(mDefaultFragmentShaderAndSerial.get().init(contextVk, fragmentShaderInfo));
-        mDefaultFragmentShaderAndSerial.updateSerial(renderer->issueShaderSerial());
-    }
+    ANGLE_TRY(vk::InitShaderAndSerial(contextVk, &mDefaultVertexShaderAndSerial, vertexCode.data(),
+                                      vertexCode.size() * sizeof(uint32_t)));
+    ANGLE_TRY(vk::InitShaderAndSerial(contextVk, &mDefaultFragmentShaderAndSerial,
+                                      fragmentCode.data(), fragmentCode.size() * sizeof(uint32_t)));
 
     ANGLE_TRY(initDefaultUniformBlocks(glContext));
 

src/libANGLE/renderer/vulkan/vk_internal_shaders.cpp

@@ -42,19 +42,9 @@ angle::Result ShaderLibrary::getShader(vk::Context *context,
         return angle::Result::Continue();
     }
 
-    const priv::ShaderBlob &shaderCode = priv::GetInternalShaderBlob(shaderID);
-
     // Create shader lazily. Access will need to be locked for multi-threading.
-    VkShaderModuleCreateInfo createInfo;
-    createInfo.sType    = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
-    createInfo.pNext    = nullptr;
-    createInfo.flags    = 0;
-    createInfo.codeSize = shaderCode.codeSize;
-    createInfo.pCode    = shaderCode.code;
-
-    ANGLE_TRY(shader.get().init(context, createInfo));
-    shader.updateSerial(context->getRenderer()->issueShaderSerial());
-    return angle::Result::Continue();
+    const priv::ShaderBlob &shaderCode = priv::GetInternalShaderBlob(shaderID);
+    return InitShaderAndSerial(context, &shader, shaderCode.code, shaderCode.codeSize);
 }
 }  // namespace vk
 }  // namespace rx

src/libANGLE/renderer/vulkan/vk_utils.cpp

@@ -1095,6 +1095,23 @@ angle::Result AllocateImageMemory(vk::Context *context,
     return AllocateBufferOrImageMemory(context, memoryPropertyFlags, image, deviceMemoryOut);
 }
 
+angle::Result InitShaderAndSerial(Context *context,
+                                  ShaderAndSerial *shaderAndSerial,
+                                  const uint32_t *shaderCode,
+                                  size_t shaderCodeSize)
+{
+    VkShaderModuleCreateInfo createInfo;
+    createInfo.sType    = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
+    createInfo.pNext    = nullptr;
+    createInfo.flags    = 0;
+    createInfo.codeSize = shaderCodeSize;
+    createInfo.pCode    = shaderCode;
+
+    ANGLE_TRY(shaderAndSerial->get().init(context, createInfo));
+    shaderAndSerial->updateSerial(context->getRenderer()->issueShaderSerial());
+    return angle::Result::Continue();
+}
+
 // GarbageObject implementation.
 GarbageObject::GarbageObject()
     : mSerial(), mHandleType(HandleType::Invalid), mHandle(VK_NULL_HANDLE)

src/libANGLE/renderer/vulkan/vk_utils.h

@@ -680,6 +680,11 @@ using ShaderMap = angle::PackedEnumMap<ShaderType, T>;
 
 using AllShaderTypes = angle::AllEnums<vk::ShaderType>;
 
+angle::Result InitShaderAndSerial(Context *context,
+                                  ShaderAndSerial *shaderAndSerial,
+                                  const uint32_t *shaderCode,
+                                  size_t shaderCodeSize);
+
 enum class RecordingMode
 {
     Start,