From e53a57fe008d41154b7a34e73c9701a8e39e71e3 Mon Sep 17 00:00:00 2001 From: HuYingzhuo Date: Sun, 28 Apr 2019 18:45:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/Vulkan/VKCommandBuffer.cpp | 3 ++- example/Vulkan/VKPipeline.h | 4 ++-- example/Vulkan/main.cpp | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/example/Vulkan/VKCommandBuffer.cpp b/example/Vulkan/VKCommandBuffer.cpp index 15c112b9..1743330a 100644 --- a/example/Vulkan/VKCommandBuffer.cpp +++ b/example/Vulkan/VKCommandBuffer.cpp @@ -71,10 +71,11 @@ bool CommandBuffer::Bind(Pipeline *p) { if(!p)return(false); + vkCmdBindPipeline(cmd_buf, VK_PIPELINE_BIND_POINT_GRAPHICS,*p); + if(p->GetDescriptorSetCount()>0) vkCmdBindDescriptorSets(cmd_buf, VK_PIPELINE_BIND_POINT_GRAPHICS, p->GetLayout(), 0, p->GetDescriptorSetCount(),p->GetDescriptorSets(), 0, nullptr); - vkCmdBindPipeline(cmd_buf, VK_PIPELINE_BIND_POINT_GRAPHICS,*p); return(true); } diff --git a/example/Vulkan/VKPipeline.h b/example/Vulkan/VKPipeline.h index 9e851e4d..2d15304a 100644 --- a/example/Vulkan/VKPipeline.h +++ b/example/Vulkan/VKPipeline.h @@ -26,8 +26,8 @@ public: VkPipelineLayout GetLayout(){return pipeline_layout;} - const uint32_t GetDescriptorSetCount()const{return desc_sets->GetCount();} - const VkDescriptorSet * GetDescriptorSets()const{return desc_sets->GetData();} + const uint32_t GetDescriptorSetCount ()const{return desc_sets->GetCount();} + const VkDescriptorSet * GetDescriptorSets ()const{return desc_sets->GetData();} };//class GraphicsPipeline class Shader; diff --git a/example/Vulkan/main.cpp b/example/Vulkan/main.cpp index 22e0310d..1a547444 100644 --- a/example/Vulkan/main.cpp +++ b/example/Vulkan/main.cpp @@ -172,7 +172,7 @@ private: if(!ubo_mvp) return(false); - + return material_instance->UpdateUBO("world",*ubo_mvp); } @@ -259,7 +259,7 @@ int main(int,char **) app.AcquireNextFrame(); app.Draw(); - //wait_seconds(0.1); + wait_seconds(0.5); return 0; }