projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: Pass stdout to _mesa_print_ir from st_glsl_to_tgsi.
[mesa.git]
/
src
/
glx
/
apple
/
apple_cgl.c
diff --git
a/src/glx/apple/apple_cgl.c
b/src/glx/apple/apple_cgl.c
index 737d757ed525b78b0a555a23f988cf55a35c0fc5..648ed8694977a64c8ee3e463ded96aa79bebac52 100644
(file)
--- 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;
apple_cgl_init(void)
{
void *h;
- GLint major = 0, minor = 0;
const char *opengl_framework_path;
if (initialized)
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 = 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");
}
fprintf(stderr, "WARNING: the CGL major version has changed!\n"
"libGL may be incompatible!\n");
}