Skip to content

Commit 6b7c69c

Browse files
Update submodules for astc, fmt, ktx, spdlog and tinyglrf (KhronosGroup#1356)
All updated to latest, except for fmt and spdlog as they require very specific version matching
1 parent 4d40b65 commit 6b7c69c

7 files changed

Lines changed: 6 additions & 8 deletions

File tree

framework/gltf_loader.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,6 @@ std::unique_ptr<sg::Sampler> GLTFLoader::parse_sampler(const tinygltf::Sampler &
15081508

15091509
VkSamplerAddressMode address_mode_u = find_wrap_mode(gltf_sampler.wrapS);
15101510
VkSamplerAddressMode address_mode_v = find_wrap_mode(gltf_sampler.wrapT);
1511-
VkSamplerAddressMode address_mode_w = find_wrap_mode(gltf_sampler.wrapR);
15121511

15131512
VkSamplerCreateInfo sampler_info{VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO};
15141513

@@ -1517,7 +1516,6 @@ std::unique_ptr<sg::Sampler> GLTFLoader::parse_sampler(const tinygltf::Sampler &
15171516
sampler_info.mipmapMode = mipmap_mode;
15181517
sampler_info.addressModeU = address_mode_u;
15191518
sampler_info.addressModeV = address_mode_v;
1520-
sampler_info.addressModeW = address_mode_w;
15211519
sampler_info.borderColor = VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE;
15221520
sampler_info.maxLod = std::numeric_limits<float>::max();
15231521

@@ -1547,7 +1545,6 @@ std::unique_ptr<sg::Sampler> GLTFLoader::create_default_sampler(int filter)
15471545

15481546
gltf_sampler.wrapS = TINYGLTF_TEXTURE_WRAP_REPEAT;
15491547
gltf_sampler.wrapT = TINYGLTF_TEXTURE_WRAP_REPEAT;
1550-
gltf_sampler.wrapR = TINYGLTF_TEXTURE_WRAP_REPEAT;
15511548

15521549
return parse_sampler(gltf_sampler);
15531550
}

third_party/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ set(KTX_SOURCES
155155
${KTX_DIR}/lib/vkformat_enum.h
156156
${KTX_DIR}/lib/vkformat_str.c
157157
${KTX_DIR}/lib/vkformat_typesize.c
158+
${KTX_DIR}/lib/vkformat_check_variant.c
158159
${KTX_DIR}/lib/vk_funcs.c
159160
${KTX_DIR}/lib/vk_funcs.h
160161
${KTX_DIR}/lib/vkloader.c

third_party/astc

Submodule astc updated 401 files

third_party/fmt

Submodule fmt updated 61 files

third_party/ktx

Submodule ktx updated 586 files

third_party/spdlog

Submodule spdlog updated 68 files

third_party/tinygltf

Submodule tinygltf updated 74 files

0 commit comments

Comments
 (0)