From 0f481cb09d3ba9f52c21aa98a2157a3dcf3a8f4c Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 7 Mar 2011 14:16:31 +0100 Subject: [PATCH] Renamed window hint reset function for clarity. --- src/init.c | 6 +++--- src/internal.h | 2 +- src/window.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/init.c b/src/init.c index ebdbbf33..889e1770 100644 --- a/src/init.c +++ b/src/init.c @@ -105,9 +105,9 @@ GLFWAPI int glfwInitWithModels(GLFWthreadmodel* threading, GLFWallocator* alloca _glfwLibrary.allocator.free = free; } - // Not all window hints are cleared to zero, so this needs to be here - // despite the memset above - _glfwClearWindowHints(); + // Not all window hints have zero as their default value, so this + // needs to be here despite the memset above + _glfwSetDefaultWindowHints(); if (!_glfwPlatformInit()) { diff --git a/src/internal.h b/src/internal.h index a9fbe16d..15502deb 100644 --- a/src/internal.h +++ b/src/internal.h @@ -324,7 +324,7 @@ void _glfwSplitBPP(int bpp, int* red, int* green, int* blue); void _glfwSetError(int error, const char* description); // Window management (window.c) -void _glfwClearWindowHints(void); +void _glfwSetDefaultWindowHints(void); // Input handling (window.c) void _glfwInputKey(_GLFWwindow* window, int key, int action); diff --git a/src/window.c b/src/window.c index de497f71..ef3814fc 100644 --- a/src/window.c +++ b/src/window.c @@ -201,10 +201,10 @@ static GLboolean isValidContextConfig(_GLFWwndconfig* wndconfig) ////////////////////////////////////////////////////////////////////////// //======================================================================== -// Clear all open window hints +// Reset all window hints to their default values //======================================================================== -void _glfwClearWindowHints(void) +void _glfwSetDefaultWindowHints(void) { memset(&_glfwLibrary.hints, 0, sizeof(_glfwLibrary.hints)); @@ -399,8 +399,8 @@ GLFWAPI GLFWwindow glfwOpenWindow(int width, int height, wndconfig.glProfile = _glfwLibrary.hints.glProfile; wndconfig.share = share; - // Clear for next open call - _glfwClearWindowHints(); + // Reset to default values for the next call + _glfwSetDefaultWindowHints(); // Check the OpenGL bits of the window config if (!isValidContextConfig(&wndconfig))