diff --git a/src/context.c b/src/context.c index f4fa63ad..d92ed402 100644 --- a/src/context.c +++ b/src/context.c @@ -195,7 +195,7 @@ const _GLFWfbconfig* _glfwChooseFBConfig(const _GLFWfbconfig* desired, { current = alternatives + i; - if (desired->stereo > 0 && current->stereo == 0) + if (desired->stereo && !current->stereo) { // Stereo is a hard constraint continue; diff --git a/src/egl_context.c b/src/egl_context.c index 156adb40..7586d5a3 100644 --- a/src/egl_context.c +++ b/src/egl_context.c @@ -650,7 +650,7 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window, if (ctxconfig->noerror) { if (_glfw.egl.KHR_create_context_no_error) - SET_ATTRIB(EGL_CONTEXT_OPENGL_NO_ERROR_KHR, GLFW_TRUE); + SET_ATTRIB(EGL_CONTEXT_OPENGL_NO_ERROR_KHR, true); } if (mask) diff --git a/src/glx_context.c b/src/glx_context.c index f08cdd5b..3d98d2a0 100644 --- a/src/glx_context.c +++ b/src/glx_context.c @@ -119,9 +119,7 @@ static GLFWbool chooseGLXFBConfig(const _GLFWfbconfig* desired, u->accumAlphaBits = getGLXFBConfigAttrib(n, GLX_ACCUM_ALPHA_SIZE); u->auxBuffers = getGLXFBConfigAttrib(n, GLX_AUX_BUFFERS); - - if (getGLXFBConfigAttrib(n, GLX_STEREO)) - u->stereo = GLFW_TRUE; + u->stereo = getGLXFBConfigAttrib(n, GLX_STEREO); if (_glfw.glx.ARB_multisample) u->samples = getGLXFBConfigAttrib(n, GLX_SAMPLES); diff --git a/src/init.c b/src/init.c index dbd5a900..7cd872c7 100644 --- a/src/init.c +++ b/src/init.c @@ -49,18 +49,18 @@ static GLFWerrorfun _glfwErrorCallback; static GLFWallocator _glfwInitAllocator; static _GLFWinitconfig _glfwInitHints = { - .hatButtons = GLFW_TRUE, + .hatButtons = true, .angleType = GLFW_ANGLE_PLATFORM_TYPE_NONE, .platformID = GLFW_ANY_PLATFORM, .vulkanLoader = NULL, .ns = { - .menubar = GLFW_TRUE, - .chdir = GLFW_TRUE + .menubar = true, + .chdir = true }, .x11 = { - .xcbVulkanSurface = GLFW_TRUE, + .xcbVulkanSurface = true, }, .wl = { diff --git a/src/internal.h b/src/internal.h index de703740..15049a3e 100644 --- a/src/internal.h +++ b/src/internal.h @@ -374,16 +374,16 @@ struct _GLFWerror // struct _GLFWinitconfig { - GLFWbool hatButtons; + bool hatButtons; int angleType; int platformID; PFN_vkGetInstanceProcAddr vulkanLoader; struct { - GLFWbool menubar; - GLFWbool chdir; + bool menubar; + bool chdir; } ns; struct { - GLFWbool xcbVulkanSurface; + bool xcbVulkanSurface; } x11; struct { int libdecorMode; @@ -402,18 +402,18 @@ struct _GLFWwndconfig int ypos; int width; int height; - GLFWbool resizable; - GLFWbool visible; - GLFWbool decorated; - GLFWbool focused; - GLFWbool autoIconify; - GLFWbool floating; - GLFWbool maximized; - GLFWbool centerCursor; - GLFWbool focusOnShow; - GLFWbool mousePassthrough; - GLFWbool scaleToMonitor; - GLFWbool scaleFramebuffer; + bool resizable; + bool visible; + bool decorated; + bool focused; + bool autoIconify; + bool floating; + bool maximized; + bool centerCursor; + bool focusOnShow; + bool mousePassthrough; + bool scaleToMonitor; + bool scaleFramebuffer; struct { char frameName[256]; } ns; @@ -422,8 +422,8 @@ struct _GLFWwndconfig char instanceName[256]; } x11; struct { - GLFWbool keymenu; - GLFWbool showDefault; + bool keymenu; + bool showDefault; } win32; struct { char appId[256]; @@ -442,15 +442,15 @@ struct _GLFWctxconfig int source; int major; int minor; - GLFWbool forward; - GLFWbool debug; - GLFWbool noerror; + bool forward; + bool debug; + bool noerror; int profile; int robustness; int release; _GLFWwindow* share; struct { - GLFWbool offline; + bool offline; } nsgl; }; @@ -475,11 +475,11 @@ struct _GLFWfbconfig int accumBlueBits; int accumAlphaBits; int auxBuffers; - GLFWbool stereo; + bool stereo; int samples; - GLFWbool sRGB; - GLFWbool doublebuffer; - GLFWbool transparent; + bool sRGB; + bool doublebuffer; + bool transparent; uintptr_t handle; }; diff --git a/src/wgl_context.c b/src/wgl_context.c index 1fb7d322..dac695e3 100644 --- a/src/wgl_context.c +++ b/src/wgl_context.c @@ -186,28 +186,22 @@ static int choosePixelFormatWGL(_GLFWwindow* window, u->accumAlphaBits = FIND_ATTRIB_VALUE(WGL_ACCUM_ALPHA_BITS_ARB); u->auxBuffers = FIND_ATTRIB_VALUE(WGL_AUX_BUFFERS_ARB); - - if (FIND_ATTRIB_VALUE(WGL_STEREO_ARB)) - u->stereo = GLFW_TRUE; + u->stereo = FIND_ATTRIB_VALUE(WGL_STEREO_ARB); if (_glfw.wgl.ARB_multisample) u->samples = FIND_ATTRIB_VALUE(WGL_SAMPLES_ARB); if (ctxconfig->client == GLFW_OPENGL_API) { - if (_glfw.wgl.ARB_framebuffer_sRGB || - _glfw.wgl.EXT_framebuffer_sRGB) - { - if (FIND_ATTRIB_VALUE(WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB)) - u->sRGB = GLFW_TRUE; - } + if (_glfw.wgl.ARB_framebuffer_sRGB || _glfw.wgl.EXT_framebuffer_sRGB) + u->sRGB = FIND_ATTRIB_VALUE(WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB); } else { if (_glfw.wgl.EXT_colorspace) { if (FIND_ATTRIB_VALUE(WGL_COLORSPACE_EXT) == WGL_COLORSPACE_SRGB_EXT) - u->sRGB = GLFW_TRUE; + u->sRGB = true; } } } @@ -261,9 +255,7 @@ static int choosePixelFormatWGL(_GLFWwindow* window, u->accumAlphaBits = pfd.cAccumAlphaBits; u->auxBuffers = pfd.cAuxBuffers; - - if (pfd.dwFlags & PFD_STEREO) - u->stereo = GLFW_TRUE; + u->stereo = (pfd.dwFlags & PFD_STEREO); } u->handle = pixelFormat; @@ -664,7 +656,7 @@ GLFWbool _glfwCreateContextWGL(_GLFWwindow* window, if (ctxconfig->noerror) { if (_glfw.wgl.ARB_create_context_no_error) - SET_ATTRIB(WGL_CONTEXT_OPENGL_NO_ERROR_ARB, GLFW_TRUE); + SET_ATTRIB(WGL_CONTEXT_OPENGL_NO_ERROR_ARB, true); } // NOTE: Only request an explicitly versioned context when necessary, as diff --git a/src/window.c b/src/window.c index 36d30baf..5f92e97f 100644 --- a/src/window.c +++ b/src/window.c @@ -265,16 +265,16 @@ void glfwDefaultWindowHints(void) // The default is a focused, visible, resizable window with decorations memset(&_glfw.hints.window, 0, sizeof(_glfw.hints.window)); - _glfw.hints.window.resizable = GLFW_TRUE; - _glfw.hints.window.visible = GLFW_TRUE; - _glfw.hints.window.decorated = GLFW_TRUE; - _glfw.hints.window.focused = GLFW_TRUE; - _glfw.hints.window.autoIconify = GLFW_TRUE; - _glfw.hints.window.centerCursor = GLFW_TRUE; - _glfw.hints.window.focusOnShow = GLFW_TRUE; + _glfw.hints.window.resizable = true; + _glfw.hints.window.visible = true; + _glfw.hints.window.decorated = true; + _glfw.hints.window.focused = true; + _glfw.hints.window.autoIconify = true; + _glfw.hints.window.centerCursor = true; + _glfw.hints.window.focusOnShow = true; _glfw.hints.window.xpos = GLFW_ANY_POSITION; _glfw.hints.window.ypos = GLFW_ANY_POSITION; - _glfw.hints.window.scaleFramebuffer = GLFW_TRUE; + _glfw.hints.window.scaleFramebuffer = true; // The default is 24 bits of color, 24 bits of depth and 8 bits of stencil, // double buffered @@ -285,7 +285,7 @@ void glfwDefaultWindowHints(void) _glfw.hints.framebuffer.alphaBits = 8; _glfw.hints.framebuffer.depthBits = 24; _glfw.hints.framebuffer.stencilBits = 8; - _glfw.hints.framebuffer.doublebuffer = GLFW_TRUE; + _glfw.hints.framebuffer.doublebuffer = true; // The default is to select the highest available refresh rate _glfw.hints.refreshRate = GLFW_DONT_CARE; @@ -331,40 +331,40 @@ GLFWAPI void glfwWindowHint(int hint, int value) _glfw.hints.framebuffer.auxBuffers = value; return; case GLFW_STEREO: - _glfw.hints.framebuffer.stereo = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.framebuffer.stereo = value; return; case GLFW_DOUBLEBUFFER: - _glfw.hints.framebuffer.doublebuffer = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.framebuffer.doublebuffer = value; return; case GLFW_TRANSPARENT_FRAMEBUFFER: - _glfw.hints.framebuffer.transparent = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.framebuffer.transparent = value; return; case GLFW_SAMPLES: _glfw.hints.framebuffer.samples = value; return; case GLFW_SRGB_CAPABLE: - _glfw.hints.framebuffer.sRGB = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.framebuffer.sRGB = value; return; case GLFW_RESIZABLE: - _glfw.hints.window.resizable = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.resizable = value; return; case GLFW_DECORATED: - _glfw.hints.window.decorated = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.decorated = value; return; case GLFW_FOCUSED: - _glfw.hints.window.focused = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.focused = value; return; case GLFW_AUTO_ICONIFY: - _glfw.hints.window.autoIconify = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.autoIconify = value; return; case GLFW_FLOATING: - _glfw.hints.window.floating = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.floating = value; return; case GLFW_MAXIMIZED: - _glfw.hints.window.maximized = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.maximized = value; return; case GLFW_VISIBLE: - _glfw.hints.window.visible = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.visible = value; return; case GLFW_POSITION_X: _glfw.hints.window.xpos = value; @@ -373,29 +373,29 @@ GLFWAPI void glfwWindowHint(int hint, int value) _glfw.hints.window.ypos = value; return; case GLFW_WIN32_KEYBOARD_MENU: - _glfw.hints.window.win32.keymenu = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.win32.keymenu = value; return; case GLFW_WIN32_SHOWDEFAULT: - _glfw.hints.window.win32.showDefault = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.win32.showDefault = value; return; case GLFW_COCOA_GRAPHICS_SWITCHING: - _glfw.hints.context.nsgl.offline = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.context.nsgl.offline = value; return; case GLFW_SCALE_TO_MONITOR: - _glfw.hints.window.scaleToMonitor = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.scaleToMonitor = value; return; case GLFW_SCALE_FRAMEBUFFER: case GLFW_COCOA_RETINA_FRAMEBUFFER: - _glfw.hints.window.scaleFramebuffer = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.scaleFramebuffer = value; return; case GLFW_CENTER_CURSOR: - _glfw.hints.window.centerCursor = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.centerCursor = value; return; case GLFW_FOCUS_ON_SHOW: - _glfw.hints.window.focusOnShow = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.focusOnShow = value; return; case GLFW_MOUSE_PASSTHROUGH: - _glfw.hints.window.mousePassthrough = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.window.mousePassthrough = value; return; case GLFW_CLIENT_API: _glfw.hints.context.client = value; @@ -413,13 +413,13 @@ GLFWAPI void glfwWindowHint(int hint, int value) _glfw.hints.context.robustness = value; return; case GLFW_OPENGL_FORWARD_COMPAT: - _glfw.hints.context.forward = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.context.forward = value; return; case GLFW_CONTEXT_DEBUG: - _glfw.hints.context.debug = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.context.debug = value; return; case GLFW_CONTEXT_NO_ERROR: - _glfw.hints.context.noerror = value ? GLFW_TRUE : GLFW_FALSE; + _glfw.hints.context.noerror = value; return; case GLFW_OPENGL_PROFILE: _glfw.hints.context.profile = value;