diff options
author | Jeremy Huddleston <[email protected]> | 2010-04-01 17:00:22 -0700 |
---|---|---|
committer | Jeremy Huddleston <[email protected]> | 2010-04-01 17:01:51 -0700 |
commit | 115203281cf791221f586f03c14cfe4e0a44dd7a (patch) | |
tree | 767951e542d416243041b964dd252e030cfadf5e /src/glx/apple/apple_cgl.c | |
parent | 9aadc793f3db64cefa0b08f18abad424a659dacc (diff) |
Revert accidental commits from the xquartz tree
This reverts commit 9aadc793f3db64cefa0b08f18abad424a659dacc.
This reverts commit 69ea4e7718efb60b6b0d795a355cebd6712ceac1.
This reverts commit dbe8b013936d977ec63d6607bfd2fc6772d29787.
This reverts commit 23215ef4d60a86d9f3b3fdc08e3fdadc59e98890.
This reverts commit 9495e3703062d1ddaf3161f4efc23f0b51284d9b.
This reverts commit 0594cf70883b64692ba617d85f4f9b4e636e5c2b.
This reverts commit 86a7978d37393ee34f876569ac06ffdb8d7289ae.
This reverts commit 437902ce978cde9a0e1aa260f12dc232a8501c42.
Diffstat (limited to 'src/glx/apple/apple_cgl.c')
-rw-r--r-- | src/glx/apple/apple_cgl.c | 128 |
1 files changed, 0 insertions, 128 deletions
diff --git a/src/glx/apple/apple_cgl.c b/src/glx/apple/apple_cgl.c deleted file mode 100644 index 737d757ed52..00000000000 --- a/src/glx/apple/apple_cgl.c +++ /dev/null @@ -1,128 +0,0 @@ -/* - Copyright (c) 2008 Apple Inc. - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation files - (the "Software"), to deal in the Software without restriction, - including without limitation the rights to use, copy, modify, merge, - publish, distribute, sublicense, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT - HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. - - Except as contained in this notice, the name(s) of the above - copyright holders shall not be used in advertising or otherwise to - promote the sale, use or other dealings in this Software without - prior written authorization. -*/ - -#include <stdbool.h> -#include <stdio.h> -#include <stdlib.h> -#include <dlfcn.h> - -#include "apple_cgl.h" -#include "apple_glx.h" - -#ifndef OPENGL_FRAMEWORK_PATH -#define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL" -#endif - -static void *dl_handle = NULL; - -struct apple_cgl_api apple_cgl; - -static bool initialized = false; - -static void * -sym(void *h, const char *name) -{ - void *s; - - s = dlsym(h, name); - - if (NULL == s) { - fprintf(stderr, "error: %s\n", dlerror()); - abort(); - } - - return s; -} - -void -apple_cgl_init(void) -{ - void *h; - GLint major = 0, minor = 0; - const char *opengl_framework_path; - - if (initialized) - return; - - opengl_framework_path = getenv("OPENGL_FRAMEWORK_PATH"); - if (!opengl_framework_path) { - opengl_framework_path = OPENGL_FRAMEWORK_PATH; - } - - (void) dlerror(); /*drain dlerror */ - h = dlopen(opengl_framework_path, RTLD_NOW); - - if (NULL == h) { - fprintf(stderr, "error: unable to dlopen %s : %s\n", - opengl_framework_path, dlerror()); - abort(); - } - - dl_handle = h; - - apple_cgl.get_version = sym(h, "CGLGetVersion"); - - apple_cgl.get_version(&major, &minor); - - apple_glx_diagnostic("CGL major %d minor %d\n", major, minor); - - if (1 != major) { - fprintf(stderr, "WARNING: the CGL major version has changed!\n" - "libGL may be incompatible!\n"); - } - - apple_cgl.choose_pixel_format = sym(h, "CGLChoosePixelFormat"); - apple_cgl.destroy_pixel_format = sym(h, "CGLDestroyPixelFormat"); - - apple_cgl.clear_drawable = sym(h, "CGLClearDrawable"); - apple_cgl.flush_drawable = sym(h, "CGLFlushDrawable"); - - apple_cgl.create_context = sym(h, "CGLCreateContext"); - apple_cgl.destroy_context = sym(h, "CGLDestroyContext"); - - apple_cgl.set_current_context = sym(h, "CGLSetCurrentContext"); - apple_cgl.get_current_context = sym(h, "CGLGetCurrentContext"); - apple_cgl.error_string = sym(h, "CGLErrorString"); - - apple_cgl.set_off_screen = sym(h, "CGLSetOffScreen"); - - apple_cgl.copy_context = sym(h, "CGLCopyContext"); - - apple_cgl.create_pbuffer = sym(h, "CGLCreatePBuffer"); - apple_cgl.destroy_pbuffer = sym(h, "CGLDestroyPBuffer"); - apple_cgl.set_pbuffer = sym(h, "CGLSetPBuffer"); - - initialized = true; -} - -void * -apple_cgl_get_dl_handle(void) -{ - return dl_handle; -} |