From d7caf256a041d3796da95639b31c4dc3572e716c Mon Sep 17 00:00:00 2001 From: "Matias N. Goldberg" Date: Mon, 4 Dec 2023 11:42:56 -0300 Subject: [PATCH 1/2] Bump patch version --- OgreMain/include/OgrePrerequisites.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OgreMain/include/OgrePrerequisites.h b/OgreMain/include/OgrePrerequisites.h index aa1f9b21575..4d641d62d76 100644 --- a/OgreMain/include/OgrePrerequisites.h +++ b/OgreMain/include/OgrePrerequisites.h @@ -65,7 +65,7 @@ namespace Ogre { // Define ogre version #define OGRE_VERSION_MAJOR 2 #define OGRE_VERSION_MINOR 3 - #define OGRE_VERSION_PATCH 3 + #define OGRE_VERSION_PATCH 4 #define OGRE_VERSION_SUFFIX "" #define OGRE_VERSION_NAME "Daedalus" From 62fa784b5b7fcd2449b81e90ee67d666cf94e985 Mon Sep 17 00:00:00 2001 From: "Matias N. Goldberg" Date: Mon, 4 Dec 2023 11:44:00 -0300 Subject: [PATCH 2/2] [Vk]Non-coherent memory pools were being ignored This fails in latest Android Studio Simulator API_LEVEL 34 --- RenderSystems/Vulkan/src/Vao/OgreVulkanVaoManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RenderSystems/Vulkan/src/Vao/OgreVulkanVaoManager.cpp b/RenderSystems/Vulkan/src/Vao/OgreVulkanVaoManager.cpp index 7af8c7d8bef..d64cd98560a 100644 --- a/RenderSystems/Vulkan/src/Vao/OgreVulkanVaoManager.cpp +++ b/RenderSystems/Vulkan/src/Vao/OgreVulkanVaoManager.cpp @@ -781,7 +781,7 @@ namespace Ogre ( VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT ) ) == VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT ) { - // addMemoryType( CPU_WRITE_PERSISTENT, memProperties, i ); + addMemoryType( CPU_WRITE_PERSISTENT, memProperties, i ); } // Find coherent memory (many desktop GPUs don't provide this)