summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-06-11 23:43:03 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-06-11 23:43:03 -0700
commitdf1dacf093058e74ec102d8828d2751a9ed6e34e (patch)
tree82ba88e9b4772ef73ea76db1aa56fe88dbc651e9
parent02b6e97c75bf2e013064e789b70704c6376e0628 (diff)
apple: Store the CGL API version number for future reference
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/glx/apple/apple_cgl.c7
-rw-r--r--src/glx/apple/apple_cgl.h3
2 files changed, 5 insertions, 5 deletions
diff --git a/src/glx/apple/apple_cgl.c b/src/glx/apple/apple_cgl.c
index 737d757ed52..648ed869497 100644
--- a/src/glx/apple/apple_cgl.c
+++ b/src/glx/apple/apple_cgl.c
@@ -64,7 +64,6 @@ void
apple_cgl_init(void)
{
void *h;
- GLint major = 0, minor = 0;
const char *opengl_framework_path;
if (initialized)
@@ -88,11 +87,11 @@ apple_cgl_init(void)
apple_cgl.get_version = sym(h, "CGLGetVersion");
- apple_cgl.get_version(&major, &minor);
+ apple_cgl.get_version(&apple_cgl.version_major, &apple_cgl.version_minor);
- apple_glx_diagnostic("CGL major %d minor %d\n", major, minor);
+ apple_glx_diagnostic("CGL major %d minor %d\n", apple_cgl.version_major, apple_cgl.version_minor);
- if (1 != major) {
+ if (1 != apple_cgl.version_major) {
fprintf(stderr, "WARNING: the CGL major version has changed!\n"
"libGL may be incompatible!\n");
}
diff --git a/src/glx/apple/apple_cgl.h b/src/glx/apple/apple_cgl.h
index 5e98a00fe79..002c7e64bad 100644
--- a/src/glx/apple/apple_cgl.h
+++ b/src/glx/apple/apple_cgl.h
@@ -40,7 +40,8 @@
struct apple_cgl_api
{
- void (*get_version) (GLint * majorvers, GLint * minorvers);
+ GLint version_major, version_minor;
+ void (*get_version) (GLint * version_major, GLint * version_minor);
CGLError(*choose_pixel_format) (const CGLPixelFormatAttribute * attribs,
CGLPixelFormatObj * pix, GLint * npix);