Skip to content

handling engine runs on macOS #474

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.

Sign up for GitHub

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
merged 2 commits into from
Oct 22, 2025
Merged

handling engine runs on macOS #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2e802f
handled runs on macos
JeanPhilippeKernel Oct 20, 2025
1a32f99
reverted renderer frame output
JeanPhilippeKernel Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Resources/Shaders/infinite_grid.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void main()
{
vec2 dudv = vec2(length(vec2(dFdx(uv.x), dFdy(uv.x))), length(vec2(dFdx(uv.y), dFdy(uv.y))));

float lodLevel = max(0.0, log10((length(dudv) * gridMinPixelsBetweenCells) / gridCellSize) + 1.0);
float lodLevel = max(0.0, log_10((length(dudv) * gridMinPixelsBetweenCells) / gridCellSize) + 1.0);
float lodFade = fract(lodLevel);

float lod0 = gridCellSize * pow(10.0, floor(lodLevel + 0));
Expand Down
3 changes: 2 additions & 1 deletion Resources/Shaders/utility.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
float log10(float x)

float log_10(float x)
{
return log(x) / log(10.0);
}
Expand Down
35 changes: 28 additions & 7 deletions ZEngine/ZEngine/Hardwares/VulkanDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ namespace ZEngine::Hardwares

VkInstanceCreateInfo instance_create_info = {.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pNext = VK_NULL_HANDLE, .flags = 0, .pApplicationInfo = &app_info};

auto scratch = ZGetScratch(Arena);
#ifdef __APPLE__
instance_create_info.flags = VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
#endif
auto scratch = ZGetScratch(Arena);

Array<const char*> enabled_layer_name_collection;
Array<LayerProperty> selected_layer_property_collection;
Expand All @@ -71,7 +74,9 @@ namespace ZEngine::Hardwares
validation_layer_name_collection.push("VK_LAYER_LUNARG_api_dump");
validation_layer_name_collection.push("VK_LAYER_KHRONOS_validation");
validation_layer_name_collection.push("VK_LAYER_LUNARG_monitor");
#ifndef __APPLE__
validation_layer_name_collection.push("VK_LAYER_LUNARG_screenshot");
#endif

for (const char* layer_name : validation_layer_name_collection)
{
Expand Down Expand Up @@ -126,6 +131,9 @@ namespace ZEngine::Hardwares
}
}

#ifdef __APPLE__
enabled_extension_layer_name_collection.push(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
#endif
instance_create_info.enabledLayerCount = enabled_layer_name_collection.size();
instance_create_info.ppEnabledLayerNames = enabled_layer_name_collection.data();
instance_create_info.enabledExtensionCount = enabled_extension_layer_name_collection.size();
Expand Down Expand Up @@ -175,16 +183,26 @@ namespace ZEngine::Hardwares

for (VkPhysicalDevice physical_device : physical_device_collection)
{
VkPhysicalDeviceProperties physical_device_properties;
VkPhysicalDeviceFeatures physical_device_feature;
VkPhysicalDeviceDescriptorIndexingProperties indexing_properties = {};
indexing_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES;

VkPhysicalDeviceProperties physical_device_properties;
VkPhysicalDeviceProperties2 physical_device_properties2 = {};
physical_device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
physical_device_properties2.pNext = &indexing_properties;

VkPhysicalDeviceFeatures physical_device_feature;

vkGetPhysicalDeviceProperties(physical_device, &physical_device_properties);
vkGetPhysicalDeviceProperties2(physical_device, &physical_device_properties2);
vkGetPhysicalDeviceFeatures(physical_device, &physical_device_feature);

if ((physical_device_feature.geometryShader == VK_TRUE) && (physical_device_feature.samplerAnisotropy == VK_TRUE) && ((physical_device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU) || (physical_device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU)))
if (/*(physical_device_feature.geometryShader == VK_TRUE) && (physical_device_feature.samplerAnisotropy == VK_TRUE) && */ ((physical_device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU) || (physical_device_properties.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU)))
{
PhysicalDevice = physical_device;
PhysicalDeviceProperties = physical_device_properties;
PhysicalDeviceFeature = physical_device_feature;
PhysicalDevice = physical_device;
PhysicalDeviceProperties = physical_device_properties;
PhysicalDeviceDescriptorIndexingProperties = indexing_properties;
PhysicalDeviceFeature = physical_device_feature;
vkGetPhysicalDeviceMemoryProperties(PhysicalDevice, &PhysicalDeviceMemoryProperties);
break;
}
Expand All @@ -197,6 +215,9 @@ namespace ZEngine::Hardwares

requested_device_extension_layer_name_collection.push(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
requested_device_extension_layer_name_collection.push(VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME);
#ifdef __APPLE__
requested_device_extension_layer_name_collection.push("VK_KHR_portability_subset");
#endif

for (LayerProperty& layer : selected_layer_property_collection)
{
Expand Down
Loading
Loading