Add glu::ShaderType <-> VkShaderStage utils to vkPrograms

Change-Id: I04b98eb3cab6c0676c509e6065a652dc9848cd99

diff --git a/external/vulkancts/framework/vulkan/vkPrograms.cpp b/external/vulkancts/framework/vulkan/vkPrograms.cpp
index a73d7f8..4483885 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkPrograms.cpp
+++ b/external/vulkancts/framework/vulkan/vkPrograms.cpp
@@ -84,11 +84,11 @@ Move<VkShaderModule> createShaderModule (const DeviceInterface& deviceInterface,
        {
                const struct VkShaderModuleCreateInfo           shaderModuleInfo        =
                {
-                       VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO,    //      VkStructureType         sType;
-                       DE_NULL,                                                                                //      const void*                     pNext;
-                       (deUintptr)binary.getSize(),                                    //      deUintptr                       codeSize;
-                       binary.getBinary(),                                                             //      const void*                     pCode;
-                       flags,                                                                                  //      VkShaderModuleCreateFlags       flags;
+                       VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO,
+                       DE_NULL,
+                       (deUintptr)binary.getSize(),
+                       binary.getBinary(),
+                       flags,
                };
 
                return createShaderModule(deviceInterface, device, &shaderModuleInfo);
@@ -97,4 +97,34 @@ Move<VkShaderModule> createShaderModule (const DeviceInterface& deviceInterface,
                TCU_THROW(NotSupportedError, "Unsupported program format");
 }
 
+glu::ShaderType getGluShaderType (VkShaderStage shaderStage)
+{
+       static const glu::ShaderType s_shaderTypes[] =
+       {
+               glu::SHADERTYPE_VERTEX,
+               glu::SHADERTYPE_TESSELLATION_CONTROL,
+               glu::SHADERTYPE_TESSELLATION_EVALUATION,
+               glu::SHADERTYPE_GEOMETRY,
+               glu::SHADERTYPE_FRAGMENT,
+               glu::SHADERTYPE_COMPUTE
+       };
+
+       return de::getSizedArrayElement<VK_SHADER_STAGE_LAST>(s_shaderTypes, shaderStage);
+}
+
+VkShaderStage getVkShaderStage (glu::ShaderType shaderType)
+{
+       static const VkShaderStage s_shaderStages[] =
+       {
+               VK_SHADER_STAGE_VERTEX,
+               VK_SHADER_STAGE_FRAGMENT,
+               VK_SHADER_STAGE_GEOMETRY,
+               VK_SHADER_STAGE_TESS_CONTROL,
+               VK_SHADER_STAGE_TESS_EVALUATION,
+               VK_SHADER_STAGE_COMPUTE
+       };
+
+       return de::getSizedArrayElement<glu::SHADERTYPE_LAST>(s_shaderStages, shaderType);
+}
+
 } // vk

diff --git a/external/vulkancts/framework/vulkan/vkPrograms.hpp b/external/vulkancts/framework/vulkan/vkPrograms.hpp
index dfc30d9..356eb16 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkPrograms.hpp
+++ b/external/vulkancts/framework/vulkan/vkPrograms.hpp
@@ -185,6 +185,9 @@ ProgramBinary*                      buildProgram            (const glu::ProgramSources& program, ProgramForma
 ProgramBinary*                 assembleProgram         (const vk::SpirVAsmSource& program, SpirVProgramInfo* buildInfo);
 Move<VkShaderModule>   createShaderModule      (const DeviceInterface& deviceInterface, VkDevice device, const ProgramBinary& binary, VkShaderModuleCreateFlags flags);
 
+glu::ShaderType                        getGluShaderType        (VkShaderStage shaderStage);
+VkShaderStage                  getVkShaderStage        (glu::ShaderType shaderType);
+
 } // vk
 
 #endif // _VKPROGRAMS_HPP