diff --git a/CMCore b/CMCore index 924d4dab..021df224 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 924d4dab342fd3628de2b96319ac0b00a39cd4ae +Subproject commit 021df224d02430159428c51c01883ce23ab4f03e diff --git a/CMSceneGraph b/CMSceneGraph index a464c980..97c907b8 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit a464c98068f52c9266dfae888a712d2db9103f44 +Subproject commit 97c907b8bff43cdecafbf1678868aaaab9930925 diff --git a/src/SceneGraph/Vulkan/VKTextureLoader.cpp b/src/SceneGraph/Vulkan/VKTextureLoader.cpp index f1503a56..c719fb68 100644 --- a/src/SceneGraph/Vulkan/VKTextureLoader.cpp +++ b/src/SceneGraph/Vulkan/VKTextureLoader.cpp @@ -36,8 +36,12 @@ namespace {UPF_ABGR8, 4,{'A','B','G','R'},{ 8, 8, 8, 8},VulkanDataType::UNORM}, {UPF_A2BGR10, 4,{'A','B','G','R'},{ 2,10,10,10},VulkanDataType::UNORM}, {UPF_R16, 1,{'R', 0 , 0 , 0 },{16, 0, 0, 0},VulkanDataType::UNORM}, + {UPF_R16U, 1,{'R', 0 , 0 , 0 },{16, 0, 0, 0},VulkanDataType::UINT}, + {UPF_R16I, 1,{'R', 0 , 0 , 0 },{16, 0, 0, 0},VulkanDataType::SINT}, {UPF_R16F, 1,{'R', 0 , 0 , 0 },{16, 0, 0, 0},VulkanDataType::SFLOAT}, {UPF_RG16, 2,{'R','G', 0 , 0 },{16,16, 0, 0},VulkanDataType::UNORM}, + {UPF_RG16U, 2,{'R','G', 0 , 0 },{16,16, 0, 0},VulkanDataType::UINT}, + {UPF_RG16I, 2,{'R','G', 0 , 0 },{16,16, 0, 0},VulkanDataType::SINT}, {UPF_RG16F, 2,{'R','G', 0 , 0 },{16,16, 0, 0},VulkanDataType::SFLOAT}, { PF_RGBA16UN, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::UNORM}, { PF_RGBA16SN, 4,{'R','G','B','A'},{16,16,16,16},VulkanDataType::SNORM},