diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-19 15:39:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-19 15:39:22 +0400 |
| commit | 6adec303dbe321b380620dc0159629ac9dd12f6f (patch) | |
| tree | acb4fa0a9a3ce5e126467dba7cde7858f37dc26e /intern/ghost | |
| parent | 196f7f0f1f9444e41aa1e6a6e5561771e2fd56d5 (diff) | |
revert (ifdef) r54745. which enbabled alpha in the GL buffer.
looks to be the cause of bug [#35415]
we can make this optional.
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 4 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 3871ececee8..2d3997cdc14 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -692,7 +692,9 @@ GHOST_TSuccess GHOST_WindowWin32::initMultisample(PIXELFORMATDESCRIPTOR pfd) WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB, WGL_COLOR_BITS_ARB, pfd.cColorBits, WGL_DEPTH_BITS_ARB, pfd.cDepthBits, +#ifdef GHOST_OPENGL_ALPHA WGL_ALPHA_BITS_ARB, pfd.cAlphaBits, +#endif WGL_STENCIL_BITS_ARB, pfd.cStencilBits, WGL_DOUBLE_BUFFER_ARB, GL_TRUE, WGL_SAMPLE_BUFFERS_ARB, GL_TRUE, @@ -1302,8 +1304,10 @@ static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd) weight += pfd.cColorBits - 8; +#ifdef GHOST_OPENGL_ALPHA if (pfd.cAlphaBits > 0) weight ++; +#endif /* want swap copy capability -- it matters a lot */ if (pfd.dwFlags & PFD_SWAP_COPY) weight += 16; diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 20855a126a8..25d7c181b68 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -211,7 +211,9 @@ GHOST_WindowX11( attributes[i++] = GLX_BLUE_SIZE; attributes[i++] = 1; attributes[i++] = GLX_GREEN_SIZE; attributes[i++] = 1; attributes[i++] = GLX_DEPTH_SIZE; attributes[i++] = 1; +#ifdef GHOST_OPENGL_ALPHA attributes[i++] = GLX_ALPHA_SIZE; attributes[i++] = 1; +#endif /* GLX >= 1.4 required for multi-sample */ if (samples && (glxVersionMajor >= 1) && (glxVersionMinor >= 4)) { attributes[i++] = GLX_SAMPLE_BUFFERS; attributes[i++] = 1; |