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

renamed type DescriptorSetType to DescriptorSetsType

Browse Source
This commit is contained in:
hyzboy
2021-09-27 21:20:22 +08:00
parent e56730ec87
commit 7ba2d0cf6f
32 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example/Vulkan/Atomsphere.cpp
View File

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

14
example/Vulkan/DeferredModel.cpp
View File

@@ -38,7 +38,7 @@ constexpr VkFormat gbuffer_depth_format=PF_D16UN;
struct alignas(16) PhongPointLight
{
Vector3f color;
Vector4f color;
Vector4f position;
float radius;
};//
@@ -198,7 +198,7 @@ private:
sampler=db->CreateSampler(&sampler_create_info);
{
MaterialParameters *mp_global=sp_gbuffer.material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=sp_gbuffer.material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);
@@ -209,7 +209,7 @@ private:
}
{
MaterialParameters *mp=sp_gbuffer.material_instance->GetMP(DescriptorSetType::Value);
MaterialParameters *mp=sp_gbuffer.material_instance->GetMP(DescriptorSetsType::Value);
if(!mp)
return(false);
@@ -220,7 +220,7 @@ private:
}
{
MaterialParameters *mp_global=sp_composition.material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=sp_composition.material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);
@@ -231,7 +231,7 @@ private:
}
{
MaterialParameters *mp=sp_composition.material_instance->GetMP(DescriptorSetType::Value);
MaterialParameters *mp=sp_composition.material_instance->GetMP(DescriptorSetsType::Value);
if(!mp)
return(false);
@@ -379,8 +379,8 @@ public:
// White
lights.position = Vector4f(0.0f, 0.0f, 50.0f, 0.0f);
lights.color = Vector3f(105.0f);
lights.radius = 150.0f;
lights.color = Vector4f(1.0f);
lights.radius = 15.0f;
lights.position.x = sin(hgl_rad2deg(timer/100)) * 100.0f;
lights.position.y = cos(hgl_rad2deg(timer/100)) * 100.0f;

4
example/Vulkan/DrawText.cpp
View File

@@ -65,7 +65,7 @@ private:
sampler=db->CreateSampler();
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);
@@ -76,7 +76,7 @@ private:
}
{
MaterialParameters *mp=material_instance->GetMP(DescriptorSetType::Value);
MaterialParameters *mp=material_instance->GetMP(DescriptorSetsType::Value);
if(!mp)
return(false);

4
example/Vulkan/DrawTile.cpp
View File

@@ -167,7 +167,7 @@ private:
sampler=db->CreateSampler();
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);
@@ -178,7 +178,7 @@ private:
}
{
MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetType::Value);
MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetsType::Value);
if(!mp_texture)
return(false);

2
example/Vulkan/FragCoordTest.cpp
View File

@@ -61,7 +61,7 @@ private:
return(false);
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);

2
example/Vulkan/Geometry3D.cpp
View File

@@ -45,7 +45,7 @@ private:
return(false);
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);

4
example/Vulkan/HQFilterTexture.cpp
View File

@@ -161,7 +161,7 @@ private:
if(!mir->material_instance)return(false);
{
MaterialParameters *mp_global=mir->material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=mir->material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);
@@ -172,7 +172,7 @@ private:
}
{
MaterialParameters *mp_texture=mir->material_instance->GetMP(DescriptorSetType::Value);
MaterialParameters *mp_texture=mir->material_instance->GetMP(DescriptorSetsType::Value);
if(!mp_texture)
return(false);

8
example/Vulkan/InlineGeometryScene.cpp
View File

@@ -130,7 +130,7 @@ private:
if(!material_instance)return(false);
{
MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetType::Value);
MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetsType::Value);
if(!mp_texture)
return(false);
@@ -213,7 +213,7 @@ private:
ubo_phong=db->CreateUBO(sizeof(PhongMaterial),&phong);
{
MaterialParameters *mp_value=material_instance->GetMP(DescriptorSetType::Value);
MaterialParameters *mp_value=material_instance->GetMP(DescriptorSetsType::Value);
if(!mp_value)
return(false);
@@ -225,7 +225,7 @@ private:
}
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);
@@ -236,7 +236,7 @@ private:
}
{
MaterialParameters *mp_global=axis_mi->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=axis_mi->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);

4
example/Vulkan/OffscreenRender.cpp
View File

@@ -72,7 +72,7 @@ public:
return(false);
{
MaterialParameters *mp_global=ro->material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=ro->material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);
@@ -143,7 +143,7 @@ public:
if(!cube.sampler)return(false);
{
MaterialParameters *mp_texture=cube.material_instance->GetMP(DescriptorSetType::Value);
MaterialParameters *mp_texture=cube.material_instance->GetMP(DescriptorSetsType::Value);
if(!mp_texture)
return(false);

4
example/Vulkan/RectanglePrimitive.cpp
View File

@@ -61,7 +61,7 @@ private:
sampler=db->CreateSampler();
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);
@@ -72,7 +72,7 @@ private:
}
{
MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetType::Value);
MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetsType::Value);
if(!mp_texture)
return(false);

2
example/Vulkan/first_triangle.cpp
View File

@@ -71,7 +71,7 @@ private:
return(false);
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);

2
example/Vulkan/indices_rect.cpp
View File

@@ -70,7 +70,7 @@ private:
return(false);
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);

4
example/Vulkan/texture_rect.cpp
View File

@@ -75,7 +75,7 @@ private:
sampler=db->CreateSampler();
{
MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetType::Value);
MaterialParameters *mp_texture=material_instance->GetMP(DescriptorSetsType::Value);
if(!mp_texture)
return(false);
@@ -103,7 +103,7 @@ private:
return(false);
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);

2
example/Vulkan/two_triangle.cpp
View File

@@ -71,7 +71,7 @@ private:
return(false);
{
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetType::Global);
MaterialParameters *mp_global=material_instance->GetMP(DescriptorSetsType::Global);
if(!mp_global)
return(false);