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

use InlinePipeline instead filename

Browse Source
This commit is contained in:
hyzboy 2020-10-16 17:24:01 +08:00
parent ccf24106ab
commit cc18764cf6
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 6113fb00e0a3c8896de4018f554432679fc5fe43
Subproject commit 443e5d302bb1ef0b8fb2e0da6b95ff784e568354

2
example/Vulkan/Atomsphere.cpp
View File

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

2
example/Vulkan/DrawText.cpp
View File

@ -59,7 +59,7 @@ private:
material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/LumTextureRect2D"));
if(!material_instance)return(false);
pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/default"),Prim::Rectangles);
pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::Rectangles);
if(!pipeline)return(false);
sampler=db->CreateSampler();

2
example/Vulkan/DrawTile.cpp
View File

@ -150,7 +150,7 @@ private:
if(!material_instance)
return(false);
pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/default"),Prim::Rectangles);
pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::Rectangles);
sampler=db->CreateSampler();

2
example/Vulkan/FragCoordTest.cpp
View File

@ -41,7 +41,7 @@ private:
if(!material_instance)
return(false);
pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/solid2d"),Prim::TriangleStrip);
pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::TriangleStrip);
if(!pipeline)
return(false);

2
example/Vulkan/Geometry2D.cpp
View File

@ -52,7 +52,7 @@ private:
if(!material_instance)return(false);
pipeline=CreatePipeline(material,OS_TEXT("res/pipeline/solid2d"),Prim::Fan);
pipeline=CreatePipeline(material,vulkan::InlinePipeline::Solid2D,Prim::Fan);
return pipeline;
}

2
example/Vulkan/Geometry3D.cpp
View File

@ -43,7 +43,7 @@ private:
mdp->material_instance=db->CreateMaterialInstance(mdp->material);
if(!mdp->material_instance)return(false);
mdp->pipeline=CreatePipeline(mdp->material_instance,OS_TEXT("res/pipeline/default"),primitive);
mdp->pipeline=CreatePipeline(mdp->material_instance,vulkan::InlinePipeline::Solid3D,primitive);
if(!mdp->material_instance->BindUBO("world",GetCameraMatrixBuffer()))
return(false);

2
example/Vulkan/HQFilterTexture.cpp
View File

@ -152,7 +152,7 @@ private:
bool InitMaterial()
{
pipeline_data=vulkan::GetPipelineData(OS_TEXT("res/pipeline/solid2d"));
pipeline_data=vulkan::GetPipelineData(vulkan::InlinePipeline::Solid2D);
if(!pipeline_data)return(false);
if(!InitMaterial(&mp_normal,OS_TEXT("res/material/Texture2DPC")))return(false);

4
example/Vulkan/InlineGeometryScene.cpp
View File

@ -50,7 +50,7 @@ private:
material_instance=db->CreateMaterialInstance(material);
if(!material_instance)return(false);
pipeline_data=vulkan::GetPipelineData(OS_TEXT("res/pipeline/default"));
pipeline_data=vulkan::GetPipelineData(vulkan::InlinePipeline::Solid3D);
if(!pipeline_data)return(false);
pipeline_line=CreatePipeline(material,pipeline_data,Prim::Lines);
@ -78,7 +78,7 @@ private:
pgci.side_step.u=10;
pgci.side_step.v=10;
pgci.color.Set(0.75,0,0,1);
pgci.color.Set(0.5,0,0,1);
pgci.side_color.Set(1,0,0,1);
ro_plane_grid=CreateRenderablePlaneGrid(db,material,&pgci);

2
example/Vulkan/RectanglePrimitive.cpp
View File

@ -52,7 +52,7 @@ private:
material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/TextureRect2D"));
if(!material_instance)return(false);
pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/default"),Prim::Rectangles);
pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D,Prim::Rectangles);
if(!pipeline)return(false);
texture=vulkan::CreateTextureFromFile(device,OS_TEXT("res/image/lena.Tex2D"));

2
example/Vulkan/first_triangle.cpp
View File

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

2
example/Vulkan/indices_rect.cpp
View File

@ -49,7 +49,7 @@ private:
material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/FragColor"));
if(!material_instance)return(false);
pipeline=CreatePipeline(material_instance,OS_TEXT("res/pipeline/solid2d")); //等同上一行，为Framework重载，默认使用swapchain的render target
pipeline=CreatePipeline(material_instance,vulkan::InlinePipeline::Solid2D);
return(true);
}