diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-28 07:21:25 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-28 07:21:25 -0600 |
| commit | 1fa7789e828d1005e2473fc7cd364bd45eb30843 (patch) | |
| tree | 5e3e1978e6cc511e90298622b7a04840a285782d /src/glx/glcontextmodes.c | |
| parent | 37e98e5cd217075d58456753ed8450dc116fe32c (diff) | |
| parent | eecd2a59c1205246cc220ab09a79988838bb1759 (diff) | |
Merge branch '7.8'
Conflicts:
src/glx/dri2_glx.c
src/glx/glx_pbuffer.c
Diffstat (limited to 'src/glx/glcontextmodes.c')
| -rw-r--r-- | src/glx/glcontextmodes.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/glx/glcontextmodes.c b/src/glx/glcontextmodes.c index eb9037907f..cdc16f8330 100644 --- a/src/glx/glcontextmodes.c +++ b/src/glx/glcontextmodes.c @@ -237,9 +237,11 @@ _gl_get_context_mode_data(const __GLcontextModes * mode, int attribute, case GLX_LEVEL: *value_return = mode->level; return 0; +#ifndef GLX_USE_APPLEGL /* This isn't supported by CGL. */ case GLX_TRANSPARENT_TYPE_EXT: *value_return = mode->transparentPixel; return 0; +#endif case GLX_TRANSPARENT_RED_VALUE: *value_return = mode->transparentRed; return 0; @@ -285,6 +287,7 @@ _gl_get_context_mode_data(const __GLcontextModes * mode, int attribute, case GLX_MAX_PBUFFER_PIXELS: *value_return = mode->maxPbufferPixels; return 0; +#ifndef GLX_USE_APPLEGL /* These aren't supported by CGL. */ case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX: *value_return = mode->optimalPbufferWidth; return 0; @@ -294,6 +297,7 @@ _gl_get_context_mode_data(const __GLcontextModes * mode, int attribute, case GLX_SWAP_METHOD_OML: *value_return = mode->swapMethod; return 0; +#endif case GLX_SAMPLE_BUFFERS_SGIS: *value_return = mode->sampleBuffers; return 0; |