diff --git a/CMCore b/CMCore index 5a88a607..48abdf2a 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 5a88a6072ce8d7ad64508631f29df60ab4a85d9d +Subproject commit 48abdf2a894ba87d609f9ea4b3c9464467cec797 diff --git a/CMPlatform b/CMPlatform index 32606016..eca08f0a 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit 326060163fa5a7fdbb0daec04337d42e9216c2b0 +Subproject commit eca08f0ae7aeaf81ab5818572b32051e16dd41a7 diff --git a/CMSceneGraph b/CMSceneGraph index f32f9c51..6682f005 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit f32f9c511ff0680105fc33f2e3c915486271b88b +Subproject commit 6682f0050a0ac5614f6c3f401a64289477eafb04 diff --git a/CMakeLists.txt b/CMakeLists.txt index 894c0211..e4371a4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,8 +18,6 @@ use_cm_module(Platform) use_cm_module(AssetsManage) use_cm_module(SceneGraph) -OPTION(SUPPORT_QT_VULKAN OFF) - SET(ULRE CMCore CMPlatform CMAssetsManage @@ -41,8 +39,3 @@ SET(ULRE_RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}) add_subdirectory(src) add_subdirectory(example) - -IF(SUPPORT_QT_VULKAN) - fix_project_version(1,1) - add_project_meta(META_FILES_TO_INCLUDE) -ENDIF(SUPPORT_QT_VULKAN) diff --git a/src/SceneGraph/Vulkan/VKShaderModule.cpp b/src/SceneGraph/Vulkan/VKShaderModule.cpp index 12be5eda..fc3885d4 100644 --- a/src/SceneGraph/Vulkan/VKShaderModule.cpp +++ b/src/SceneGraph/Vulkan/VKShaderModule.cpp @@ -98,7 +98,11 @@ VAB *VertexShaderModule::CreateVAB(const VABConfigInfo *cfg) if(!cfg||!cfg->Get((*si)->name,vac)) { attr->format =VK_NAMESPACE::GetVulkanFormat(&((*si)->type)); - bind->inputRate =VK_VERTEX_INPUT_RATE_VERTEX; + + if(memcmp((*si)->name.c_str(),"Inst_",5)==0) //不可以使用CaseComp("Inst_",5)会被认为是比较一个5字长的字符串,而不是只比较5个字符 + bind->inputRate =VK_VERTEX_INPUT_RATE_INSTANCE; + else + bind->inputRate =VK_VERTEX_INPUT_RATE_VERTEX; } else {