From 954eea7a94d3ba905d7bf800e0603814d7ab9ae8 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Thu, 30 May 2019 11:46:46 +0800 Subject: [PATCH] =?UTF-8?q?ShaderType=E6=94=B9=E5=90=8D=E4=B8=BAShaderStag?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inc/hgl/graph/vulkan/VK.h | 4 ++-- inc/hgl/graph/vulkan/VKCommandBuffer.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/hgl/graph/vulkan/VK.h b/inc/hgl/graph/vulkan/VK.h index c0c1e07e..c03da839 100644 --- a/inc/hgl/graph/vulkan/VK.h +++ b/inc/hgl/graph/vulkan/VK.h @@ -53,7 +53,7 @@ class Renderable; using CharPointerList=hgl::List; -enum class ShaderType +enum class ShaderStage { Vertex =VK_SHADER_STAGE_VERTEX_BIT, TessControl =VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, @@ -61,7 +61,7 @@ enum class ShaderType Geometry =VK_SHADER_STAGE_GEOMETRY_BIT, Fragment =VK_SHADER_STAGE_FRAGMENT_BIT, Compute =VK_SHADER_STAGE_COMPUTE_BIT -};// +};//enum class ShaderStage struct PushConstant { diff --git a/inc/hgl/graph/vulkan/VKCommandBuffer.h b/inc/hgl/graph/vulkan/VKCommandBuffer.h index db108b2d..bf045771 100644 --- a/inc/hgl/graph/vulkan/VKCommandBuffer.h +++ b/inc/hgl/graph/vulkan/VKCommandBuffer.h @@ -92,9 +92,9 @@ public: return(true); } - void PushConstants(ShaderType shader_type,uint32_t offset,uint32_t size,const void *pValues) + void PushConstants(ShaderStage shader_stage,uint32_t offset,uint32_t size,const void *pValues) { - vkCmdPushConstants(cmd_buf,pipeline_layout,(VkShaderStageFlagBits)shader_type,offset,size,pValues); + vkCmdPushConstants(cmd_buf,pipeline_layout,(VkShaderStageFlagBits)shader_stage,offset,size,pValues); } void PushConstants(const PushConstant *pc){vkCmdPushConstants(cmd_buf,pipeline_layout,VK_SHADER_STAGE_VERTEX_BIT,0,sizeof(PushConstant),pc);}