Minor warning fixes, cross platform extension fix

Author: tylertms

src/app/editor/editor.c

@@ -396,10 +396,12 @@ static bool drawViewportWindow(
     if (!vkrt || !status || !runtime) return false;
 
     ImGuiWindowClass viewportWindowClass = {0};
-    viewportWindowClass.DockNodeFlagsOverrideSet = ImGuiDockNodeFlags_NoTabBar |
-                                                   ImGuiDockNodeFlags_NoUndocking |
-                                                   ImGuiDockNodeFlags_NoWindowMenuButton |
-                                                   ImGuiDockNodeFlags_NoCloseButton;
+    viewportWindowClass.DockNodeFlagsOverrideSet = (ImGuiDockNodeFlags)(
+        ImGuiDockNodeFlags_NoTabBar |
+        ImGuiDockNodeFlags_NoUndocking |
+        ImGuiDockNodeFlags_NoWindowMenuButton |
+        ImGuiDockNodeFlags_NoCloseButton
+    );
     ImGui_SetNextWindowClass(&viewportWindowClass);
 
     ImGui_PushStyleVarImVec2(ImGuiStyleVar_WindowPadding, (ImVec2){0.0f, 0.0f});

src/app/editor/inspector/common.c

@@ -90,7 +90,7 @@ void formatByteSize(uint64_t bytes, char* out, size_t outSize) {
     if (!out || outSize == 0) return;
 
     static const char* symbols[] = {"B", "KB", "MB", "GB"};
-    double _bytes = bytes;
+    double _bytes = (double)bytes;
     int index;
 
     for (index = 0; index < 3; index++) {

src/app/render/sequencer.c

@@ -19,8 +19,6 @@
 #define VKRT_MKDIR(path) mkdir(path, 0755)
 #endif
 
-static const float kRenderSequenceMinStep = 0.0001f;
-static const float kRenderSequenceDefaultStep = 0.05f;
 static const float kMicrosecondsPerSecond = 1000000.0f;
 static const uint32_t kMinimumFramesForEta = 2u;
 enum {

src/core/api/lifecycle.c

@@ -27,6 +27,10 @@ static inline void logStepTime(const char* stepName, uint64_t startTime) {
     LOG_TRACE("%s in %.3f ms", stepName, (double)(getMicroseconds() - startTime) / 1e3);
 }
 
+static inline uint32_t defaultWindowExtentFromDisplay(uint32_t displayExtent) {
+    return displayExtent > 1u ? (uint32_t)(((uint64_t)displayExtent * 4u) / 5u) : 1u;
+}
+
 static uint32_t g_glfwInitRefCount = 0u;
 
 static VKRT_Result acquireGLFW(void) {
@@ -307,8 +311,8 @@ VKRT_Result VKRT_initWithCreateInfo(VKRT* vkrt, const VKRT_CreateInfo* createInf
 
     uint32_t width = createInfo->startFullscreen ? displayWidth : createInfo->width;
     uint32_t height = createInfo->startFullscreen ? displayHeight : createInfo->height;
-    if (width == 0) width = createInfo->startMaximized ? displayWidth : (displayWidth > 1u ? displayWidth * 0.8 : 1u);
-    if (height == 0) height = createInfo->startMaximized ? displayHeight : (displayHeight > 1u ? displayHeight * 0.8 : 1u);
+    if (width == 0) width = createInfo->startMaximized ? displayWidth : defaultWindowExtentFromDisplay(displayWidth);
+    if (height == 0) height = createInfo->startMaximized ? displayHeight : defaultWindowExtentFromDisplay(displayHeight);
     if (width == 0) width = VKRT_DEFAULT_WIDTH;
     if (height == 0) height = VKRT_DEFAULT_HEIGHT;
     if (vkrt->runtime.headless) {

src/core/runtime/device.c

@@ -18,7 +18,7 @@ const char* requiredDeviceExtensions[NUM_REQ_EXTENSIONS] = {
 };
 
 const char* optionalDeviceExtensions[NUM_OPT_EXTENSIONS] = {
-    VK_NV_RAY_TRACING_INVOCATION_REORDER_EXTENSION_NAME
+    VK_EXT_RAY_TRACING_INVOCATION_REORDER_EXTENSION_NAME
 };
 
 const uint32_t requiredDeviceExtensionBits[NUM_REQ_EXTENSIONS] = {
@@ -440,8 +440,8 @@ VKRT_Result createLogicalDevice(VKRT* vkrt) {
     deviceRayTracingPipelineFeatures.rayTracingPipelineTraceRaysIndirect = VK_FALSE;
     deviceRayTracingPipelineFeatures.rayTraversalPrimitiveCulling = VK_FALSE;
 
-    VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV supportedReorderFeatures = {0};
-    supportedReorderFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV;
+    VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT supportedReorderFeatures = {0};
+    supportedReorderFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_EXT;
     if (extensionSupport.availableMask & DEVICE_EXTENSION_RAY_TRACING_INVOCATION_REORDER_BIT) {
         VkPhysicalDeviceRayTracingPipelineFeaturesKHR supportedRayTracingPipelineFeatures = {0};
         supportedRayTracingPipelineFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR;
@@ -452,8 +452,8 @@ VKRT_Result createLogicalDevice(VKRT* vkrt) {
         supportedFeatures.pNext = &supportedRayTracingPipelineFeatures;
         vkGetPhysicalDeviceFeatures2(vkrt->core.physicalDevice, &supportedFeatures);
 
-        VkPhysicalDeviceRayTracingInvocationReorderPropertiesNV reorderProperties = {0};
-        reorderProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_NV;
+        VkPhysicalDeviceRayTracingInvocationReorderPropertiesEXT reorderProperties = {0};
+        reorderProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_PROPERTIES_EXT;
 
         VkPhysicalDeviceProperties2 supportedProperties = {0};
         supportedProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
@@ -464,8 +464,8 @@ VKRT_Result createLogicalDevice(VKRT* vkrt) {
         vkrt->core.serMaxShaderBindingTableRecordIndex = 0u;
     }
 
-    VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV deviceReorderFeatures = {0};
-    deviceReorderFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV;
+    VkPhysicalDeviceRayTracingInvocationReorderFeaturesEXT deviceReorderFeatures = {0};
+    deviceReorderFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_EXT;
     deviceReorderFeatures.pNext = &deviceAccelerationStructureFeatures;
     deviceReorderFeatures.rayTracingInvocationReorder = VK_TRUE;
 
@@ -546,15 +546,15 @@ VKRT_Result createLogicalDevice(VKRT* vkrt) {
             (extensionSupport.availableMask & DEVICE_EXTENSION_RAY_TRACING_INVOCATION_REORDER_BIT)) {
         LOG_INFO(
             "    Optional extension %s was available but disabled by request",
-            VK_NV_RAY_TRACING_INVOCATION_REORDER_EXTENSION_NAME
+            VK_EXT_RAY_TRACING_INVOCATION_REORDER_EXTENSION_NAME
         );
     }
 
     if ((extensionSupport.availableMask & DEVICE_EXTENSION_RAY_TRACING_INVOCATION_REORDER_BIT) &&
             !supportedReorderFeatures.rayTracingInvocationReorder) {
         LOG_INFO(
             "    Optional extension %s was loaded but its feature is unsupported, so it was not enabled",
-            VK_NV_RAY_TRACING_INVOCATION_REORDER_EXTENSION_NAME
+            VK_EXT_RAY_TRACING_INVOCATION_REORDER_EXTENSION_NAME
         );
     }
 

src/core/utility/io.c

@@ -101,7 +101,12 @@ static FILE* fopen_exe_relative(const char* relpath, const char* mode) {
     size_t dirlen = strlen(buf);
     snprintf(buf + dirlen, sizeof buf - dirlen, "/%s", relpath);
 
+#if defined(_WIN32)
+    FILE* file = NULL;
+    return fopen_s(&file, buf, mode) == 0 ? file : NULL;
+#else
     return fopen(buf, mode);
+#endif
 }
 
 static int pathExists(const char* path) {

src/shaders/meson.build

@@ -36,8 +36,8 @@ foreach shader_program : shader_programs
   endif
 
   if 'ser' in shader_features
-    shader_capabilities += ['-capability', 'spvShaderInvocationReorderNV']
-    shader_extra_args += ['-DVKRT_SER_ENABLED']
+    shader_capabilities += ['-capability', 'spvShaderInvocationReorderEXT']
+    shader_extra_args += ['-DVKRT_SER_ENABLED', '-warnings-disable', '41012']
   endif
 
   shader_target = custom_target(