Pipeline定义修正
This commit is contained in:
parent
63cde270b9
commit
68ca384521
@ -40,6 +40,7 @@ public:
|
|||||||
const VkExtent2D & GetExtent ()const {return attr->swapchain_extent;}
|
const VkExtent2D & GetExtent ()const {return attr->swapchain_extent;}
|
||||||
|
|
||||||
VkDescriptorPool GetDescriptorPool () {return attr->desc_pool;}
|
VkDescriptorPool GetDescriptorPool () {return attr->desc_pool;}
|
||||||
|
VkPipelineCache GetPipelineCache () {return attr->pipeline_cache;}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
@ -308,7 +308,7 @@ namespace
|
|||||||
|
|
||||||
VkPipelineCache cache;
|
VkPipelineCache cache;
|
||||||
|
|
||||||
if(!vkCreatePipelineCache(device, &pipelineCache, nullptr, &cache)!=VK_SUCCESS)
|
if(vkCreatePipelineCache(device, &pipelineCache, nullptr, &cache)!=VK_SUCCESS)
|
||||||
return(nullptr);
|
return(nullptr);
|
||||||
|
|
||||||
return cache;
|
return cache;
|
||||||
|
@ -14,6 +14,7 @@ PipelineCreater::PipelineCreater(Device *dev)
|
|||||||
{
|
{
|
||||||
device=dev->GetDevice();
|
device=dev->GetDevice();
|
||||||
extent=dev->GetExtent();
|
extent=dev->GetExtent();
|
||||||
|
cache=dev->GetPipelineCache();
|
||||||
|
|
||||||
hgl_zero(pipelineInfo);
|
hgl_zero(pipelineInfo);
|
||||||
pipelineInfo.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
|
pipelineInfo.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
|
||||||
@ -133,7 +134,7 @@ Pipeline *PipelineCreater::Create()
|
|||||||
{
|
{
|
||||||
VkPipeline graphicsPipeline;
|
VkPipeline graphicsPipeline;
|
||||||
|
|
||||||
if (vkCreateGraphicsPipelines(device, VK_NULL_HANDLE, 1, &pipelineInfo, nullptr, &graphicsPipeline) != VK_SUCCESS)
|
if (vkCreateGraphicsPipelines(device, cache, 1, &pipelineInfo, nullptr, &graphicsPipeline) != VK_SUCCESS)
|
||||||
return(nullptr);
|
return(nullptr);
|
||||||
|
|
||||||
return(new Pipeline(device,graphicsPipeline));
|
return(new Pipeline(device,graphicsPipeline));
|
||||||
|
@ -27,6 +27,7 @@ class PipelineCreater
|
|||||||
{
|
{
|
||||||
VkDevice device;
|
VkDevice device;
|
||||||
VkExtent2D extent;
|
VkExtent2D extent;
|
||||||
|
VkPipelineCache cache;
|
||||||
VkGraphicsPipelineCreateInfo pipelineInfo;
|
VkGraphicsPipelineCreateInfo pipelineInfo;
|
||||||
|
|
||||||
VkPipelineVertexInputStateCreateInfo vis_create_info;
|
VkPipelineVertexInputStateCreateInfo vis_create_info;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user