From ab355031959ba2550f5e6184b23d31a756833bc9 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 29 Oct 2013 19:19:56 +0100 Subject: [PATCH] ogl: don't force depth+stencil for default framebuffer --- Source/Core/DolphinWX/Src/GLInterface/EGL.cpp | 3 +-- Source/Core/DolphinWX/Src/GLInterface/GLX.cpp | 7 ++----- Source/Core/DolphinWX/Src/GLInterface/WGL.cpp | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp index b8276ae546..d6f3631cfb 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/EGL.cpp @@ -45,12 +45,11 @@ bool cInterfaceEGL::Create(void *&window_handle) EGLint num_configs; // attributes for a visual in RGBA format with at least - // 8 bits per color and a 24 bit depth buffer + // 8 bits per color int attribs[] = { EGL_RED_SIZE, 8, EGL_GREEN_SIZE, 8, EGL_BLUE_SIZE, 8, - EGL_DEPTH_SIZE, 24, #ifdef USE_GLES #ifdef USE_GLES3 EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, diff --git a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp index 929d365081..22b472d662 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/GLX.cpp @@ -55,20 +55,18 @@ bool cInterfaceGLX::Create(void *&window_handle) int glxMajorVersion, glxMinorVersion; // attributes for a single buffered visual in RGBA format with at least - // 8 bits per color and a 24 bit depth buffer + // 8 bits per color int attrListSgl[] = {GLX_RGBA, GLX_RED_SIZE, 8, GLX_GREEN_SIZE, 8, GLX_BLUE_SIZE, 8, - GLX_DEPTH_SIZE, 24, None}; // attributes for a double buffered visual in RGBA format with at least - // 8 bits per color and a 24 bit depth buffer + // 8 bits per color int attrListDbl[] = {GLX_RGBA, GLX_DOUBLEBUFFER, GLX_RED_SIZE, 8, GLX_GREEN_SIZE, 8, GLX_BLUE_SIZE, 8, - GLX_DEPTH_SIZE, 24, None }; int attrListDefault[] = { @@ -77,7 +75,6 @@ bool cInterfaceGLX::Create(void *&window_handle) GLX_GREEN_SIZE, 1, GLX_BLUE_SIZE, 1, GLX_DOUBLEBUFFER, - GLX_DEPTH_SIZE, 1, None }; GLWin.dpy = XOpenDisplay(0); diff --git a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp index 7ba315a5b4..5a4276b9c5 100644 --- a/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp +++ b/Source/Core/DolphinWX/Src/GLInterface/WGL.cpp @@ -84,8 +84,8 @@ bool cInterfaceWGL::Create(void *&window_handle) 0, // Shift Bit Ignored 0, // No Accumulation Buffer 0, 0, 0, 0, // Accumulation Bits Ignored - 24, // 24Bit Z-Buffer (Depth Buffer) - 8, // 8bit Stencil Buffer + 0, // 0Bit Z-Buffer (Depth Buffer) + 0, // 0bit Stencil Buffer 0, // No Auxiliary Buffer PFD_MAIN_PLANE, // Main Drawing Layer 0, // Reserved