diff --git a/CMSceneGraph b/CMSceneGraph index 3844b827..ba8cc189 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 3844b827bf33c5aeb420e3a84db92ec5e6770da9 +Subproject commit ba8cc1897ebcf0e826a1e24d6652596afc9eccde diff --git a/example/Vulkan/TextureFormat.cpp b/example/Vulkan/TextureFormat.cpp index c437c9de..87ee3853 100644 --- a/example/Vulkan/TextureFormat.cpp +++ b/example/Vulkan/TextureFormat.cpp @@ -95,14 +95,14 @@ int main(int,char **) else std::cout<bytes<<" bytes/pixel."; - if(vf->depth!=VulkanDataType::NONE) + if(vf->depth!=VulkanNumberType::NONE) std::cout<<"[Depth:"<depth)]<<"]"; - if(vf->stencil!=VulkanDataType::NONE) + if(vf->stencil!=VulkanNumberType::NONE) std::cout<<"[Stencil:"<stencil)]<<"]"; - if((vf->depth==VulkanDataType::NONE) - &&(vf->stencil==VulkanDataType::NONE)) + if((vf->depth==VulkanNumberType::NONE) + &&(vf->stencil==VulkanNumberType::NONE)) std::cout<<"[Color:"<color)]<<"]"; { diff --git a/src/SceneGraph/Vulkan/VKTileData.cpp b/src/SceneGraph/Vulkan/VKTileData.cpp index df0ae137..9cea3f83 100644 --- a/src/SceneGraph/Vulkan/VKTileData.cpp +++ b/src/SceneGraph/Vulkan/VKTileData.cpp @@ -82,14 +82,12 @@ TileData *GPUDevice::CreateTileData(const VkFormat format,const uint width,const Texture2D *tex=nullptr; VkExtent2D extent={tex_width,tex_height}; - if(vf->color>VulkanDataType::NONE - &&vf->colorcolor)) { tex=CreateTexture2D(new ColorTextureCreateInfo(format,extent)); } else - if(vf->depth>VulkanDataType::NONE - &&vf->depthdepth)) { tex=CreateTexture2D(new DepthTextureCreateInfo(format,extent)); }