Commit 7c925353 authored by Camilla Berglund's avatar Camilla Berglund
Browse files

Renamed context module headers.

parent 8113c007
......@@ -38,16 +38,16 @@ elseif (_GLFW_WAYLAND)
endif()
if (_GLFW_EGL)
list(APPEND glfw_HEADERS ${common_HEADERS} egl_platform.h)
list(APPEND glfw_HEADERS ${common_HEADERS} egl_context.h)
list(APPEND glfw_SOURCES ${common_SOURCES} egl_context.c)
elseif (_GLFW_NSGL)
list(APPEND glfw_HEADERS ${common_HEADERS} nsgl_platform.h)
list(APPEND glfw_HEADERS ${common_HEADERS} nsgl_context.h)
list(APPEND glfw_SOURCES ${common_SOURCES} nsgl_context.m)
elseif (_GLFW_WGL)
list(APPEND glfw_HEADERS ${common_HEADERS} wgl_platform.h)
list(APPEND glfw_HEADERS ${common_HEADERS} wgl_context.h)
list(APPEND glfw_SOURCES ${common_SOURCES} wgl_context.c)
elseif (_GLFW_X11)
list(APPEND glfw_HEADERS ${common_HEADERS} glx_platform.h)
list(APPEND glfw_HEADERS ${common_HEADERS} glx_context.h)
list(APPEND glfw_SOURCES ${common_SOURCES} glx_context.c)
endif()
......
......@@ -40,7 +40,7 @@ typedef void* id;
#include "posix_tls.h"
#if defined(_GLFW_NSGL)
#include "nsgl_platform.h"
#include "nsgl_context.h"
#else
#error "No supported context creation API selected"
#endif
......
......@@ -25,8 +25,8 @@
//
//========================================================================
#ifndef _egl_platform_h_
#define _egl_platform_h_
#ifndef _egl_context_h_
#define _egl_context_h_
#include <EGL/egl.h>
......@@ -91,4 +91,4 @@ int _glfwAnalyzeContext(const _GLFWwindow* window,
const _GLFWctxconfig* ctxconfig,
const _GLFWfbconfig* fbconfig);
#endif // _egl_platform_h_
#endif // _egl_context_h_
......@@ -25,8 +25,8 @@
//
//========================================================================
#ifndef _glx_platform_h_
#define _glx_platform_h_
#ifndef _glx_context_h_
#define _glx_context_h_
#define GLX_GLXEXT_LEGACY
#include <GL/glx.h>
......@@ -123,4 +123,4 @@ int _glfwCreateContext(_GLFWwindow* window,
const _GLFWfbconfig* fbconfig);
void _glfwDestroyContext(_GLFWwindow* window);
#endif // _glx_platform_h_
#endif // _glx_context_h_
......@@ -200,7 +200,7 @@ struct _GLFWfbconfig
int samples;
GLboolean sRGB;
// This is defined in the context API's platform.h
// This is defined in the context API's context.h
_GLFW_PLATFORM_FBCONFIG;
};
......@@ -262,7 +262,7 @@ struct _GLFWwindow
// This is defined in the window API's platform.h
_GLFW_PLATFORM_WINDOW_STATE;
// This is defined in the context API's platform.h
// This is defined in the context API's context.h
_GLFW_PLATFORM_CONTEXT_STATE;
};
......@@ -347,7 +347,7 @@ struct _GLFWlibrary
// This is defined in the window API's platform.h
_GLFW_PLATFORM_LIBRARY_WINDOW_STATE;
// This is defined in the context API's platform.h
// This is defined in the context API's context.h
_GLFW_PLATFORM_LIBRARY_OPENGL_STATE;
// This is defined in the platform's time.h
_GLFW_PLATFORM_LIBRARY_TIME_STATE;
......
......@@ -24,8 +24,8 @@
//
//========================================================================
#ifndef _nsgl_platform_h_
#define _nsgl_platform_h_
#ifndef _nsgl_context_h_
#define _nsgl_context_h_
#define _GLFW_PLATFORM_FBCONFIG
#define _GLFW_PLATFORM_CONTEXT_STATE _GLFWcontextNSGL nsgl
......@@ -68,4 +68,4 @@ int _glfwCreateContext(_GLFWwindow* window,
const _GLFWfbconfig* fbconfig);
void _glfwDestroyContext(_GLFWwindow* window);
#endif // _nsgl_platform_h_
#endif // _nsgl_context_h_
......@@ -31,7 +31,7 @@
#include <wayland-client.h>
#if defined(_GLFW_EGL)
#include "egl_platform.h"
#include "egl_context.h"
#else
#error "The Wayland backend depends on EGL platform support"
#endif
......
......@@ -25,8 +25,8 @@
//
//========================================================================
#ifndef _wgl_platform_h_
#define _wgl_platform_h_
#ifndef _wgl_context_h_
#define _wgl_context_h_
// This path may need to be changed if you build GLFW using your own setup
// We ship and use our own copy of wglext.h since GLFW uses fairly new
......@@ -95,4 +95,4 @@ int _glfwAnalyzeContext(const _GLFWwindow* window,
const _GLFWctxconfig* ctxconfig,
const _GLFWfbconfig* fbconfig);
#endif // _wgl_platform_h_
#endif // _wgl_context_h_
......@@ -154,11 +154,11 @@ typedef HRESULT (WINAPI * DWMISCOMPOSITIONENABLED_T)(BOOL*);
#include "win32_tls.h"
#if defined(_GLFW_WGL)
#include "wgl_platform.h"
#include "wgl_context.h"
#elif defined(_GLFW_EGL)
#define _GLFW_EGL_NATIVE_WINDOW window->win32.handle
#define _GLFW_EGL_NATIVE_DISPLAY EGL_DEFAULT_DISPLAY
#include "egl_platform.h"
#include "egl_context.h"
#else
#error "No supported context creation API selected"
#endif
......
......@@ -52,12 +52,12 @@
#if defined(_GLFW_GLX)
#define _GLFW_X11_CONTEXT_VISUAL window->glx.visual
#include "glx_platform.h"
#include "glx_context.h"
#elif defined(_GLFW_EGL)
#define _GLFW_X11_CONTEXT_VISUAL window->egl.visual
#define _GLFW_EGL_NATIVE_WINDOW window->x11.handle
#define _GLFW_EGL_NATIVE_DISPLAY _glfw.x11.display
#include "egl_platform.h"
#include "egl_context.h"
#else
#error "No supported context creation API selected"
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment