From 51683a6f1ca12cf29567a8f0850a05808f431a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Thu, 26 Mar 2026 18:51:54 +0100 Subject: [PATCH] Use C99 booleans for Khronos API extensions --- src/glx_context.c | 24 +++++++++++----------- src/internal.h | 48 ++++++++++++++++++++++---------------------- src/vulkan.c | 16 +++++++-------- src/win32_platform.h | 24 +++++++++++----------- src/x11_platform.h | 24 +++++++++++----------- 5 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/glx_context.c b/src/glx_context.c index 3d98d2a0..f56f674e 100644 --- a/src/glx_context.c +++ b/src/glx_context.c @@ -365,7 +365,7 @@ GLFWbool _glfwInitGLX(void) getProcAddressGLX("glXSwapIntervalEXT"); if (_glfw.glx.SwapIntervalEXT) - _glfw.glx.EXT_swap_control = GLFW_TRUE; + _glfw.glx.EXT_swap_control = true; } if (extensionSupportedGLX("GLX_SGI_swap_control")) @@ -374,7 +374,7 @@ GLFWbool _glfwInitGLX(void) getProcAddressGLX("glXSwapIntervalSGI"); if (_glfw.glx.SwapIntervalSGI) - _glfw.glx.SGI_swap_control = GLFW_TRUE; + _glfw.glx.SGI_swap_control = true; } if (extensionSupportedGLX("GLX_MESA_swap_control")) @@ -383,17 +383,17 @@ GLFWbool _glfwInitGLX(void) getProcAddressGLX("glXSwapIntervalMESA"); if (_glfw.glx.SwapIntervalMESA) - _glfw.glx.MESA_swap_control = GLFW_TRUE; + _glfw.glx.MESA_swap_control = true; } if (extensionSupportedGLX("GLX_ARB_multisample")) - _glfw.glx.ARB_multisample = GLFW_TRUE; + _glfw.glx.ARB_multisample = true; if (extensionSupportedGLX("GLX_ARB_framebuffer_sRGB")) - _glfw.glx.ARB_framebuffer_sRGB = GLFW_TRUE; + _glfw.glx.ARB_framebuffer_sRGB = true; if (extensionSupportedGLX("GLX_EXT_framebuffer_sRGB")) - _glfw.glx.EXT_framebuffer_sRGB = GLFW_TRUE; + _glfw.glx.EXT_framebuffer_sRGB = true; if (extensionSupportedGLX("GLX_ARB_create_context")) { @@ -401,23 +401,23 @@ GLFWbool _glfwInitGLX(void) getProcAddressGLX("glXCreateContextAttribsARB"); if (_glfw.glx.CreateContextAttribsARB) - _glfw.glx.ARB_create_context = GLFW_TRUE; + _glfw.glx.ARB_create_context = true; } if (extensionSupportedGLX("GLX_ARB_create_context_robustness")) - _glfw.glx.ARB_create_context_robustness = GLFW_TRUE; + _glfw.glx.ARB_create_context_robustness = true; if (extensionSupportedGLX("GLX_ARB_create_context_profile")) - _glfw.glx.ARB_create_context_profile = GLFW_TRUE; + _glfw.glx.ARB_create_context_profile = true; if (extensionSupportedGLX("GLX_EXT_create_context_es2_profile")) - _glfw.glx.EXT_create_context_es2_profile = GLFW_TRUE; + _glfw.glx.EXT_create_context_es2_profile = true; if (extensionSupportedGLX("GLX_ARB_create_context_no_error")) - _glfw.glx.ARB_create_context_no_error = GLFW_TRUE; + _glfw.glx.ARB_create_context_no_error = true; if (extensionSupportedGLX("GLX_ARB_context_flush_control")) - _glfw.glx.ARB_context_flush_control = GLFW_TRUE; + _glfw.glx.ARB_context_flush_control = true; return GLFW_TRUE; } diff --git a/src/internal.h b/src/internal.h index 56418c8d..fc3ceda5 100644 --- a/src/internal.h +++ b/src/internal.h @@ -807,22 +807,22 @@ struct _GLFWlibrary EGLint major, minor; GLFWbool prefix; - GLFWbool KHR_create_context; - GLFWbool KHR_create_context_no_error; - GLFWbool KHR_gl_colorspace; - GLFWbool KHR_get_all_proc_addresses; - GLFWbool KHR_context_flush_control; - GLFWbool EXT_client_extensions; - GLFWbool EXT_platform_base; - GLFWbool EXT_platform_x11; - GLFWbool EXT_platform_wayland; - GLFWbool EXT_present_opaque; - GLFWbool ANGLE_platform_angle; - GLFWbool ANGLE_platform_angle_opengl; - GLFWbool ANGLE_platform_angle_d3d; - GLFWbool ANGLE_platform_angle_vulkan; - GLFWbool ANGLE_platform_angle_metal; - GLFWbool MESA_platform_surfaceless; + bool KHR_create_context; + bool KHR_create_context_no_error; + bool KHR_gl_colorspace; + bool KHR_get_all_proc_addresses; + bool KHR_context_flush_control; + bool EXT_client_extensions; + bool EXT_platform_base; + bool EXT_platform_x11; + bool EXT_platform_wayland; + bool EXT_present_opaque; + bool ANGLE_platform_angle; + bool ANGLE_platform_angle_opengl; + bool ANGLE_platform_angle_d3d; + bool ANGLE_platform_angle_vulkan; + bool ANGLE_platform_angle_metal; + bool MESA_platform_surfaceless; void* handle; @@ -866,14 +866,14 @@ struct _GLFWlibrary void* handle; char* extensions[2]; PFN_vkGetInstanceProcAddr GetInstanceProcAddr; - GLFWbool KHR_surface; - GLFWbool KHR_win32_surface; - GLFWbool MVK_macos_surface; - GLFWbool EXT_metal_surface; - GLFWbool KHR_xlib_surface; - GLFWbool KHR_xcb_surface; - GLFWbool KHR_wayland_surface; - GLFWbool EXT_headless_surface; + bool KHR_surface; + bool KHR_win32_surface; + bool MVK_macos_surface; + bool EXT_metal_surface; + bool KHR_xlib_surface; + bool KHR_xcb_surface; + bool KHR_wayland_surface; + bool EXT_headless_surface; } vk; struct { diff --git a/src/vulkan.c b/src/vulkan.c index 03642a31..b93a14a6 100644 --- a/src/vulkan.c +++ b/src/vulkan.c @@ -163,21 +163,21 @@ GLFWbool _glfwInitVulkan(int mode) for (i = 0; i < count; i++) { if (strcmp(ep[i].extensionName, "VK_KHR_surface") == 0) - _glfw.vk.KHR_surface = GLFW_TRUE; + _glfw.vk.KHR_surface = true; else if (strcmp(ep[i].extensionName, "VK_KHR_win32_surface") == 0) - _glfw.vk.KHR_win32_surface = GLFW_TRUE; + _glfw.vk.KHR_win32_surface = true; else if (strcmp(ep[i].extensionName, "VK_MVK_macos_surface") == 0) - _glfw.vk.MVK_macos_surface = GLFW_TRUE; + _glfw.vk.MVK_macos_surface = true; else if (strcmp(ep[i].extensionName, "VK_EXT_metal_surface") == 0) - _glfw.vk.EXT_metal_surface = GLFW_TRUE; + _glfw.vk.EXT_metal_surface = true; else if (strcmp(ep[i].extensionName, "VK_KHR_xlib_surface") == 0) - _glfw.vk.KHR_xlib_surface = GLFW_TRUE; + _glfw.vk.KHR_xlib_surface = true; else if (strcmp(ep[i].extensionName, "VK_KHR_xcb_surface") == 0) - _glfw.vk.KHR_xcb_surface = GLFW_TRUE; + _glfw.vk.KHR_xcb_surface = true; else if (strcmp(ep[i].extensionName, "VK_KHR_wayland_surface") == 0) - _glfw.vk.KHR_wayland_surface = GLFW_TRUE; + _glfw.vk.KHR_wayland_surface = true; else if (strcmp(ep[i].extensionName, "VK_EXT_headless_surface") == 0) - _glfw.vk.EXT_headless_surface = GLFW_TRUE; + _glfw.vk.EXT_headless_surface = true; } _glfw_free(ep); diff --git a/src/win32_platform.h b/src/win32_platform.h index 49cceba6..5e9a6605 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -336,18 +336,18 @@ typedef struct _GLFWlibraryWGL PFNWGLGETEXTENSIONSSTRINGEXTPROC GetExtensionsStringEXT; PFNWGLGETEXTENSIONSSTRINGARBPROC GetExtensionsStringARB; PFNWGLCREATECONTEXTATTRIBSARBPROC CreateContextAttribsARB; - GLFWbool EXT_swap_control; - GLFWbool EXT_colorspace; - GLFWbool ARB_multisample; - GLFWbool ARB_framebuffer_sRGB; - GLFWbool EXT_framebuffer_sRGB; - GLFWbool ARB_pixel_format; - GLFWbool ARB_create_context; - GLFWbool ARB_create_context_profile; - GLFWbool EXT_create_context_es2_profile; - GLFWbool ARB_create_context_robustness; - GLFWbool ARB_create_context_no_error; - GLFWbool ARB_context_flush_control; + bool EXT_swap_control; + bool EXT_colorspace; + bool ARB_multisample; + bool ARB_framebuffer_sRGB; + bool EXT_framebuffer_sRGB; + bool ARB_pixel_format; + bool ARB_create_context; + bool ARB_create_context_profile; + bool EXT_create_context_es2_profile; + bool ARB_create_context_robustness; + bool ARB_create_context_no_error; + bool ARB_context_flush_control; } _GLFWlibraryWGL; // Win32-specific per-window data diff --git a/src/x11_platform.h b/src/x11_platform.h index f3a037f1..64915fca 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -503,18 +503,18 @@ typedef struct _GLFWlibraryGLX PFNGLXSWAPINTERVALEXTPROC SwapIntervalEXT; PFNGLXSWAPINTERVALMESAPROC SwapIntervalMESA; PFNGLXCREATECONTEXTATTRIBSARBPROC CreateContextAttribsARB; - GLFWbool SGI_swap_control; - GLFWbool EXT_swap_control; - GLFWbool MESA_swap_control; - GLFWbool ARB_multisample; - GLFWbool ARB_framebuffer_sRGB; - GLFWbool EXT_framebuffer_sRGB; - GLFWbool ARB_create_context; - GLFWbool ARB_create_context_profile; - GLFWbool ARB_create_context_robustness; - GLFWbool EXT_create_context_es2_profile; - GLFWbool ARB_create_context_no_error; - GLFWbool ARB_context_flush_control; + bool SGI_swap_control; + bool EXT_swap_control; + bool MESA_swap_control; + bool ARB_multisample; + bool ARB_framebuffer_sRGB; + bool EXT_framebuffer_sRGB; + bool ARB_create_context; + bool ARB_create_context_profile; + bool ARB_create_context_robustness; + bool EXT_create_context_es2_profile; + bool ARB_create_context_no_error; + bool ARB_context_flush_control; } _GLFWlibraryGLX; // X11-specific per-window data