Skip to content

Commit 676217f

Browse files
Fix Glfw Version to 3.3.10 to force X11 only
1 parent 3c87f05 commit 676217f

5 files changed

Lines changed: 4 additions & 4 deletions

File tree

CMakePresets.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
"GLFW_BUILD_DOCS": "OFF",
2727
"GLFW_BUILD_EXAMPLES": "OFF",
28-
"GLFW_INSTALL": "OFF",
2928

3029
"ASSIMP_BUILD_TESTS": "OFF",
3130
"ASSIMP_INSTALL": "OFF",

ZEngine/ZEngine/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@ endif()
7575

7676
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
7777
target_link_libraries(zEngineLib PUBLIC stdc++fs)
78-
target_compile_definitions(zEngineLib PUBLIC VK_USE_PLATFORM_WAYLAND_KHR)
78+
target_compile_definitions(zEngineLib PUBLIC GLFW_EXPOSE_NATIVE_X11)
7979
endif ()

ZEngine/ZEngine/Hardwares/VulkanDevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ namespace ZEngine::Hardwares
538538
bool HasSeperateTransfertQueueFamily = false;
539539
const char* ApplicationName = "Tetragrama";
540540
const char* EngineName = "ZEngine";
541-
uint32_t SwapchainImageCount = 3;
541+
uint32_t SwapchainImageCount = 4;
542542
uint32_t SwapchainImageIndex = std::numeric_limits<uint8_t>::max();
543543
uint32_t CurrentFrameIndex = std::numeric_limits<uint8_t>::max();
544544
uint32_t PreviousFrameIndex = std::numeric_limits<uint8_t>::max();

ZEngine/ZEngine/Rendering/Shaders/Shader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ namespace ZEngine::Rendering::Shaders
271271
void Shader::CreateDescriptorSetLayouts()
272272
{
273273
Array<VkDescriptorPoolSize> pool_size_collection = {};
274-
pool_size_collection.init(&LocalArena, 10);
274+
pool_size_collection.init(&LocalArena, 10, 10);
275275

276276
for (const auto& layout_binding_set : LayoutBindingSpecificationMap)
277277
{

dependencies.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ FetchContent_Declare(
3333
glfw3
3434
GIT_REPOSITORY https://github.com/glfw/glfw.git
3535
GIT_SHALLOW TRUE
36+
GIT_TAG 3.3.10
3637
)
3738

3839
FetchContent_Declare(

0 commit comments

Comments
 (0)