Fix: Added portability configurations for specific MacOS M-series #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

SpinnerX merged 24 commits into main from bug_fixes

Feb 3, 2026

demos/1-instance/application.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,38 +26,25 @@ debug_callback( @@
     }
     std::vector<const char*>
-    initialize_instance_extensions() {
+    get_instance_extensions() {
         std::vector<const char*> extension_names;
+        uint32_t extension_count = 0;
+        const char** required_extensions =
+          glfwGetRequiredInstanceExtensions(&extension_count);
-        extension_names.emplace_back(VK_KHR_SURFACE_EXTENSION_NAME);
+        for (uint32_t i = 0; i < extension_count; i++) {
+            std::println("Required Extension = {}", required_extensions[i]);
+            extension_names.emplace_back(required_extensions[i]);
+        }
         extension_names.emplace_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
-        // An additional surface extension needs to be loaded. This extension is
-        // platform-specific so needs to be selected based on the platform the
-        // example is going to be deployed to. Preprocessor directives are used
-        // here to select the correct platform.
-    #ifdef VK_USE_PLATFORM_WIN32_KHR
-        extension_names.emplace_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
-    #endif
-    #ifdef VK_USE_PLATFORM_XLIB_KHR
-        extensionNames.emplace_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
-    #endif
-    #ifdef VK_USE_PLATFORM_XCB_KHR
-        extensionNames.emplace_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);
-    #endif
-    #ifdef VK_USE_PLATFORM_ANDROID_KHR
-        extensionNames.emplace_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
-    #endif
-    #ifdef VK_USE_PLATFORM_WAYLAND_KHR
-        extensionNames.emplace_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
-    #endif
-    #ifdef VK_USE_PLATFORM_MACOS_MVK
-        extensionNames.emplace_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME);
-    #endif
-    #ifdef USE_PLATFORM_NULLWS
-        extensionNames.emplace_back(VK_KHR_DISPLAY_EXTENSION_NAME);
+    #if defined(__APPLE__)
+        extension_names.emplace_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
+        extension_names.emplace_back(
+          VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
     #endif
         return extension_names;
     }
@@ Expand Down Expand Up / @@ -90,8 +77,7 @@ main() { @@
         };
         // setting up extensions
-        std::vector<const char*> global_extensions =
-          initialize_instance_extensions();
+        std::vector<const char*> global_extensions = get_instance_extensions();
         vk::debug_message_utility debug_callback_info = {
             .severity =
@@ Expand Down @@

demos/1-instance/conanfile.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ def requirements(self): @@
             self.requires("glm/1.0.1")
             self.requires("stb/cci.20230920")
             self.requires("tinyobjloader/2.0.0-rc10")
-            self.requires("vulkan-cpp/4.0")
+            self.requires("vulkan-cpp/5.0")
         def build(self):
             cmake = CMake(self)
@@ Expand Down @@

demos/10-textures/application.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -20,6 +20,8 @@ import vk;
  
    #define GLM_FORCE_RADIANS

    #include <glm/glm.hpp>

    #include <glm/gtc/matrix_transform.hpp>

    #include <algorithm>

    #include <cmath>

    static VKAPI_ATTR VkBool32 VKAPI_CALL

    debug_callback(

    @@ -32,38 +34,25 @@ debug_callback(
  
    }

    std::vector<const char*>

    initialize_instance_extensions() {

    get_instance_extensions() {

        std::vector<const char*> extension_names;

        uint32_t extension_count = 0;

        const char** required_extensions =

          glfwGetRequiredInstanceExtensions(&extension_count);

        extension_names.emplace_back(VK_KHR_SURFACE_EXTENSION_NAME);

        for (uint32_t i = 0; i < extension_count; i++) {

            std::println("Required Extension = {}", required_extensions[i]);

            extension_names.emplace_back(required_extensions[i]);

        }

        extension_names.emplace_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);

        // An additional surface extension needs to be loaded. This extension is

        // platform-specific so needs to be selected based on the platform the

        // example is going to be deployed to. Preprocessor directives are used

        // here to select the correct platform.

    #ifdef VK_USE_PLATFORM_WIN32_KHR

        extension_names.emplace_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);

    #endif

    #ifdef VK_USE_PLATFORM_XLIB_KHR

        extensionNames.emplace_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);

    #endif

    #ifdef VK_USE_PLATFORM_XCB_KHR

        extensionNames.emplace_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);

    #endif

    #ifdef VK_USE_PLATFORM_ANDROID_KHR

        extensionNames.emplace_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);

    #endif

    #ifdef VK_USE_PLATFORM_WAYLAND_KHR

        extensionNames.emplace_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);

    #endif

    #ifdef VK_USE_PLATFORM_MACOS_MVK

        extensionNames.emplace_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME);

    #endif

    #ifdef USE_PLATFORM_NULLWS

        extensionNames.emplace_back(VK_KHR_DISPLAY_EXTENSION_NAME);

    #if defined(__APPLE__)

        extension_names.emplace_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);

        extension_names.emplace_back(

          VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);

    #endif

        return extension_names;

    }

    @@ -106,16 +95,11 @@ main() {
  
        };

        // setting up extensions

        std::vector<const char*> global_extensions =

          initialize_instance_extensions();

        std::vector<const char*> global_extensions = get_instance_extensions();

        vk::debug_message_utility debug_callback_info = {

            // .severity essentially takes in vk::message::verbose,

            // vk::message::warning, vk::message::error

            .severity =

              vk::message::verbose | vk::message::warning | vk::message::error,

            // .message_type essentially takes in vk::debug. Like:

            // vk::debug::general, vk::debug::validation, vk::debug::performance

            .message_type =

              vk::debug::general | vk::debug::validation | vk::debug::performance,

            .callback = debug_callback

    @@ -137,24 +121,18 @@ main() {
  
            std::println("\napi_instance alive and initiated!!!");

        }

        // TODO: Implement this as a way to setup physical devices

        // vk::enumerate_physical_devices(vk::instance) -> returns

        // std::span<vk::physical_device>

        // setting up physical device

        // TODO: Probably enforce the use of

        // vk::enumerate_physical_device({.device_type =

        // vk::physical_gpu::discrete})

        vk::physical_enumeration enumerate_devices{

            .device_type = vk::physical_gpu::discrete,

        };

    #if defined(__APPLE__)

        enumerate_devices.device_type = vk::physical_gpu::integrated;

    #endif

        vk::physical_device physical_device(api_instance, enumerate_devices);

        // selecting depth format

        std::array<vk::format, 3> format_support = {

            // VK_FORMAT_D32_SFLOAT,

            // VK_FORMAT_D32_SFLOAT_S8_UINT,

            // VK_FORMAT_D24_UNORM_S8_UINT,

            vk::format::d32_sfloat,

            vk::format::d32_sfloat_s8_uint,

            vk::format::d24_unorm_s8_uint

    @@ -172,7 +150,14 @@ main() {
  
        // setting up logical device

        std::array<float, 1> priorities = { 0.f };

    #if defined(__APPLE__)

        std::array<const char*, 2> extensions = { VK_KHR_SWAPCHAIN_EXTENSION_NAME,

                                                  "VK_KHR_portability_subset" };

    #else

        std::array<const char*, 1> extensions = { VK_KHR_SWAPCHAIN_EXTENSION_NAME };

    #endif

        vk::device_params logical_device_params = {

            .queue_priorities = priorities,

            .extensions = extensions,

    @@ -204,19 +189,8 @@ main() {
  
                                     surface_properties);

        // querying swapchain images

        // TODO: Make the images and framebuffers contained within the vk::swapchain

        // Considering if you have two display they will prob have their own set of

        // images to display to the two separate screens

        uint32_t image_count = 0;

        vkGetSwapchainImagesKHR(logical_device,

                                main_swapchain,

                                &image_count,

                                nullptr); // used to get the amount of images

        std::vector<VkImage> images(image_count);

        vkGetSwapchainImagesKHR(logical_device,

                                main_swapchain,

                                &image_count,

                                images.data()); // used to store in the images

        std::span<const VkImage> images = main_swapchain.get_images();

        uint32_t image_count = static_cast<uint32_t>(images.size());

        // Creating Images

        std::vector<vk::sample_image> swapchain_images(image_count);

    @@ -279,7 +253,7 @@ main() {
  
              .layout = vk::image_layout::color_optimal,

              .samples = vk::sample_bit::count_1,

              .load = vk::attachment_load::clear,

              .store = vk::attachment_store::dont_care,

              .store = vk::attachment_store::store,

              .stencil_load = vk::attachment_load::clear,

              .stencil_store = vk::attachment_store::dont_care,

              .initial_layout = vk::image_layout::undefined,

    @@ -294,7 +268,7 @@ main() {
  
              .stencil_load = vk::attachment_load::clear,

              .stencil_store = vk::attachment_store::dont_care,

              .initial_layout = vk::image_layout::undefined,

              .final_layout = vk::image_layout::present_src_khr,

              .final_layout = vk::image_layout::depth_stencil_read_only_optimal,

            },

        };

    @@ -506,7 +480,7 @@ main() {
  
        vk::texture_info config_texture = {

            .phsyical_memory_properties = physical_device.memory_properties(),

            .filepath =

              std::filesystem::path("asset_samples/container_diffuse.png")

              std::filesystem::path("asset_samples/container_diffuse.png"),

        };

        vk::texture texture1(logical_device, config_texture);

demos/10-textures/conanfile.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ def requirements(self): @@
             self.requires("glm/1.0.1")
             self.requires("stb/cci.20230920")
             self.requires("tinyobjloader/2.0.0-rc10")
-            self.requires("vulkan-cpp/4.0")
+            self.requires("vulkan-cpp/5.0")
         def build(self):
             cmake = CMake(self)
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: Added portability configurations for specific MacOS M-series #29

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!