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

renamed to DescriptorSetType instead of DescriptorSetsType

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy)
2023-02-22 21:53:51 +08:00
parent b35ef27610
commit af4b9cd6d4
33 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
example/2dVector/line.cpp
View File

@@ -82,7 +82,7 @@ private:
cam.RefreshCameraInfo();
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
if(!mp_global)
return(false);
@@ -95,7 +95,7 @@ private:
{
MaterialParameters *mp_value=material_instance->GetMP(DescriptorSetsType::Value);
MaterialParameters *mp_value=material_instance->GetMP(DescriptorSetType::Value);
if(!mp_value)
return(false);

4
example/2dVector/roundbox.cpp
View File

@@ -94,7 +94,7 @@ private:
cam.RefreshCameraInfo();
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
if(!mp_global)
return(false);
@@ -108,7 +108,7 @@ private:
}
{
MaterialParameters *mp_value=material_instance->GetMP(DescriptorSetsType::Value);
MaterialParameters *mp_value=material_instance->GetMP(DescriptorSetType::Value);
if(!mp_value)
return(false);

2
example/Vulkan/Atmosphere.cpp
View File

@@ -67,7 +67,7 @@ private:
return(false);
{
MaterialParameters *mp=material_instance->GetMP(DescriptorSetsType::Value);
MaterialParameters *mp=material_instance->GetMP(DescriptorSetType::Value);
if(!mp)return(false);

4
example/Vulkan/Cubemap.cpp
View File

@@ -98,7 +98,7 @@ private:
sky_mi=db->CreateMaterialInstance(sky_material);
if(!sky_mi)return(false);
if(!sky_mi->BindSampler(DescriptorSetsType::Value,"tex" ,texture, sampler))return(false);
if(!sky_mi->BindSampler(DescriptorSetType::Value,"tex" ,texture, sampler))return(false);
sky_pipeline=CreatePipeline(sky_mi,InlinePipeline::Sky,Prim::Triangles);
if(!sky_pipeline)return(false);
@@ -111,7 +111,7 @@ private:
envmap_mi=db->CreateMaterialInstance(envmap_material);
if(!envmap_mi)return(false);
if(!envmap_mi->BindSampler(DescriptorSetsType::Value,"EnvCubemap" ,texture, sampler))return(false);
if(!envmap_mi->BindSampler(DescriptorSetType::Value,"EnvCubemap" ,texture, sampler))return(false);
solid_pipeline=CreatePipeline(envmap_mi,InlinePipeline::Solid3D,Prim::Triangles);
}

4
example/Vulkan/DeferredRender.cpp
View File

@@ -311,7 +311,7 @@ private:
BindCameraUBO(sp_gbuffer.material_instance);
{
MaterialParameters *mp=sp_gbuffer.material_instance->GetMP(DescriptorSetsType::Value);
MaterialParameters *mp=sp_gbuffer.material_instance->GetMP(DescriptorSetType::Value);
if(!mp)
return(false);
@@ -324,7 +324,7 @@ private:
BindCameraUBO(sp_composition.material_instance);
{
MaterialParameters *mp=sp_composition.material_instance->GetMP(DescriptorSetsType::Value);
MaterialParameters *mp=sp_composition.material_instance->GetMP(DescriptorSetType::Value);
if(!mp)
return(false);

2
example/Vulkan/DrawTile.cpp
View File

@@ -165,7 +165,7 @@ private:
sampler=db->CreateSampler();
if(!material_instance->BindSampler(DescriptorSetsType::Value,"tex",tile_data->GetTexture(),sampler))return(false);
if(!material_instance->BindSampler(DescriptorSetType::Value,"tex",tile_data->GetTexture(),sampler))return(false);
return(true);
}

2
example/Vulkan/EquirectangularMap.cpp
View File

@@ -54,7 +54,7 @@ private:
envmap_mi=db->CreateMaterialInstance(OS_TEXT("res/material/EnvEquirectangularMap"));
if(!envmap_mi)return(false);
if(!envmap_mi->BindSampler(DescriptorSetsType::Value,"Envmap" ,texture, sampler))return(false);
if(!envmap_mi->BindSampler(DescriptorSetType::Value,"Envmap" ,texture, sampler))return(false);
}
solid_pipeline=CreatePipeline(envmap_mi,InlinePipeline::Solid3D,Prim::Triangles);

4
example/Vulkan/InlineGeometryScene.cpp
View File

@@ -129,7 +129,7 @@ private:
if(!material_instance)return(false);
{
MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetsType::Value);
MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetType::Value);
if(!mp_texture)
return(false);
@@ -216,7 +216,7 @@ private:
ubo_phong=db->CreateUBO(sizeof(PhongMaterial),&phong);
{
MaterialParameters *mp_value=material_instance->GetMP(DescriptorSetsType::Value);
MaterialParameters *mp_value=material_instance->GetMP(DescriptorSetType::Value);
if(!mp_value)
return(false);

2
example/Vulkan/OffscreenRender.cpp
View File

@@ -135,7 +135,7 @@ public:
cube.sampler=db->CreateSampler();
if(!cube.sampler)return(false);
if(!cube.material_instance->BindSampler(DescriptorSetsType::Value,"tex",os.render_taget->GetColorTexture(),cube.sampler))
if(!cube.material_instance->BindSampler(DescriptorSetType::Value,"tex",os.render_taget->GetColorTexture(),cube.sampler))
return(false);
{

2
example/Vulkan/RectanglePrimitive.cpp
View File

@@ -59,7 +59,7 @@ private:
sampler=db->CreateSampler();
if(!material_instance->BindSampler(DescriptorSetsType::Value,"tex",texture,sampler))return(false);
if(!material_instance->BindSampler(DescriptorSetType::Value,"tex",texture,sampler))return(false);
return(true);
}

2
example/Vulkan/SceneTree.cpp
View File

@@ -84,7 +84,7 @@ private:
if(!ubo_sun)return(false);
{
MaterialParameters *mp=material_instance->GetMP(DescriptorSetsType::Value);
MaterialParameters *mp=material_instance->GetMP(DescriptorSetType::Value);
if(!mp)return(false);

2
example/Vulkan/SkyColor.cpp
View File

@@ -71,7 +71,7 @@ private:
if(!ubo_sky_color)
return(false);
if(!material_instance->BindUBO(DescriptorSetsType::Value,"sky_color",ubo_sky_color))
if(!material_instance->BindUBO(DescriptorSetType::Value,"sky_color",ubo_sky_color))
return(false);
return(true);

2
example/Vulkan/texture_rect.cpp
View File

@@ -73,7 +73,7 @@ private:
sampler=db->CreateSampler();
if(!material_instance->BindSampler(DescriptorSetsType::Value,"tex",texture,sampler))return(false);
if(!material_instance->BindSampler(DescriptorSetType::Value,"tex",texture,sampler))return(false);
return(true);
}

2
example/common/VulkanAppFramework.h
View File

@@ -156,7 +156,7 @@ public:
bool BindCameraUBO(MaterialInstance *mi)
{
return mi->BindUBO(DescriptorSetsType::Global,"g_camera",ubo_camera_info);
return mi->BindUBO(DescriptorSetType::Global,"g_camera",ubo_camera_info);
}
virtual void Resize(int w,int h)