diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-04-30 15:27:13 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-04-30 15:27:13 +0200 |
| commit | 7662e3519bef3802024da3050b886068281e02b1 (patch) | |
| tree | bc5bf675e67febffaf9e4d1fadd139e8c253ae32 /src/glx/glcontextmodes.c | |
| parent | 9a966b93c03aecac8eb72e6133aa9a2f2c7673f3 (diff) | |
| parent | 7c769bef052fc1936d7ab33e291bb4646dc5b0d1 (diff) | |
Merge commit 'origin/master' into gallium-msaa
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; |