hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set ColorAttachments at GPUDevice::CreatePipeline

Browse Source
This commit is contained in:
hyzboy 2020-10-26 16:08:42 +08:00
parent 744c3a1963
commit b4c385c40c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 741edebad8108eeee4b256bef0dae3ba0a9fdbcb Subproject commit 4d15db4b5c42a0fb8fc9d78703ab1e98e90d142d

2
example/2dVector/line.cpp
View File

@ -53,7 +53,7 @@ private:
return(false); return(false);
// pipeline=db->CreatePipeline(material_instance,sc_render_target,OS_TEXT("res/pipeline/solid2d")); // pipeline=db->CreatePipeline(material_instance,sc_render_target,OS_TEXT("res/pipeline/solid2d"));
pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/alpha2d"),Prim::LineStrip); //等同上一行，为Framework重载，默认使用swapchain的render target pipeline=CreatePipeline(material_instance,InlinePipeline::Alpha2D,Prim::LineStrip); //等同上一行，为Framework重载，默认使用swapchain的render target
if(!pipeline) if(!pipeline)
return(false); return(false);

2
src/RenderDevice/VKPipeline.cpp
View File

@ -22,6 +22,8 @@ Pipeline *CreatePipeline(VkDevice device,VkPipelineCache pipeline_cache,Pipeline
material->GetVertexAttributeList()); material->GetVertexAttributeList());
data->InitViewportState(rt->GetExtent()); data->InitViewportState(rt->GetExtent());
data->SetColorAttachments(rt->GetColorCount());
data->pipeline_info.layout = material->GetPipelineLayout(); data->pipeline_info.layout = material->GetPipelineLayout();

4
src/RenderDevice/VKRenderResource.cpp
View File

@ -77,8 +77,6 @@ Pipeline *RenderResource::CreatePipeline(Material *mtl,RenderTarget *rt,const In
pd->Set(prim,prim_restart); pd->Set(prim,prim_restart);
pd->SetColorAttachments(rt->GetColorCount());
Pipeline *p=device->CreatePipeline(pd,mtl,rt); Pipeline *p=device->CreatePipeline(pd,mtl,rt);
if(p) if(p)
@ -95,7 +93,7 @@ Pipeline *RenderResource::CreatePipeline(MaterialInstance *mi,RenderTarget *rt,c
Pipeline *RenderResource::CreatePipeline(Material *mtl,RenderTarget *rt,PipelineData *pd,const Prim &prim,const bool prim_restart) Pipeline *RenderResource::CreatePipeline(Material *mtl,RenderTarget *rt,PipelineData *pd,const Prim &prim,const bool prim_restart)
{ {
pd->Set(prim,prim_restart); pd->Set(prim,prim_restart);
Pipeline *p=device->CreatePipeline(pd,mtl,rt); Pipeline *p=device->CreatePipeline(pd,mtl,rt);
if(p) if(p)