From 5fe0354ce4fecfef391d1e69913ad04b7f936426 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 11 Dec 2014 22:41:11 +0000 Subject: [PATCH] Drop use of CONTEXT_FORWARD_COMPATIBLE_BIT, add CORE_PROFILE_BIT --- renderdoc/driver/gl/gl_replay_linux.cpp | 4 ++-- renderdoc/driver/gl/gl_replay_win32.cpp | 4 ++-- renderdoc/hooks/gl_linux_hooks.cpp | 2 +- renderdoc/hooks/gl_win32_hooks.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/renderdoc/driver/gl/gl_replay_linux.cpp b/renderdoc/driver/gl/gl_replay_linux.cpp index 2526a5f78..b7885ce0a 100644 --- a/renderdoc/driver/gl/gl_replay_linux.cpp +++ b/renderdoc/driver/gl/gl_replay_linux.cpp @@ -119,7 +119,7 @@ uint64_t GLReplay::MakeOutputWindow(void *wn, bool depth) attribs[i++] = GLX_CONTEXT_MINOR_VERSION_ARB; attribs[i++] = 3; attribs[i++] = GLX_CONTEXT_FLAGS_ARB; - attribs[i++] = GLX_CONTEXT_DEBUG_BIT_ARB; + attribs[i++] = GLX_CONTEXT_CORE_PROFILE_BIT_ARB|GLX_CONTEXT_DEBUG_BIT_ARB; GLXContext ctx = glXCreateContextAttribsProc(dpy, fbcfg[0], m_ReplayCtx.ctx, true, attribs); @@ -249,7 +249,7 @@ ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **dr attribs[i++] = GLX_CONTEXT_MINOR_VERSION_ARB; attribs[i++] = 3; attribs[i++] = GLX_CONTEXT_FLAGS_ARB; - attribs[i++] = GLX_CONTEXT_DEBUG_BIT_ARB; + attribs[i++] = GLX_CONTEXT_CORE_PROFILE_BIT_ARB|GLX_CONTEXT_DEBUG_BIT_ARB; Display *dpy = XOpenDisplay(NULL); diff --git a/renderdoc/driver/gl/gl_replay_win32.cpp b/renderdoc/driver/gl/gl_replay_win32.cpp index 80f2dd6db..17a7ed8e0 100644 --- a/renderdoc/driver/gl/gl_replay_win32.cpp +++ b/renderdoc/driver/gl/gl_replay_win32.cpp @@ -159,7 +159,7 @@ uint64_t GLReplay::MakeOutputWindow(void *wn, bool depth) attribs[i++] = WGL_CONTEXT_MINOR_VERSION_ARB; attribs[i++] = 3; attribs[i++] = WGL_CONTEXT_FLAGS_ARB; - attribs[i++] = WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB|WGL_CONTEXT_DEBUG_BIT_ARB; + attribs[i++] = WGL_CONTEXT_CORE_PROFILE_BIT_ARB|WGL_CONTEXT_DEBUG_BIT_ARB; HGLRC rc = createContextAttribs(DC, m_ReplayCtx.ctx, attribs); if(rc == NULL) @@ -375,7 +375,7 @@ ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **dr attribs[i++] = WGL_CONTEXT_MINOR_VERSION_ARB; attribs[i++] = 3; attribs[i++] = WGL_CONTEXT_FLAGS_ARB; - attribs[i++] = WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB|WGL_CONTEXT_DEBUG_BIT_ARB; + attribs[i++] = WGL_CONTEXT_CORE_PROFILE_BIT_ARB|WGL_CONTEXT_DEBUG_BIT_ARB; rc = createContextAttribs(dc, NULL, attribs); if(rc == NULL) diff --git a/renderdoc/hooks/gl_linux_hooks.cpp b/renderdoc/hooks/gl_linux_hooks.cpp index 66b434181..2af42795f 100644 --- a/renderdoc/hooks/gl_linux_hooks.cpp +++ b/renderdoc/hooks/gl_linux_hooks.cpp @@ -310,7 +310,7 @@ class OpenGLHook : LibraryHook GLX_CONTEXT_MINOR_VERSION_ARB, 2, GLX_CONTEXT_FLAGS_ARB, - 0, + GLX_CONTEXT_CORE_PROFILE_BIT_ARB, 0, 0, }; diff --git a/renderdoc/hooks/gl_win32_hooks.cpp b/renderdoc/hooks/gl_win32_hooks.cpp index e48478a2d..dffb1da1a 100644 --- a/renderdoc/hooks/gl_win32_hooks.cpp +++ b/renderdoc/hooks/gl_win32_hooks.cpp @@ -270,7 +270,7 @@ class OpenGLHook : LibraryHook WGL_CONTEXT_MINOR_VERSION_ARB, 2, WGL_CONTEXT_FLAGS_ARB, - 0, + WGL_CONTEXT_CORE_PROFILE_BIT_ARB, 0, 0, }; ret.DC = share.DC;