apple: Rename __gl_api to __ogl_framework_api
In starting the migration to using mapi, rename __gl_api to __ogl_framework_api since it is a vtable for OpenGL.framework Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
parent
19b9e523c5
commit
88cec59170
|
@ -38,7 +38,7 @@
|
||||||
#include "apple_glx_context.h"
|
#include "apple_glx_context.h"
|
||||||
#include "apple_xgl_api.h"
|
#include "apple_xgl_api.h"
|
||||||
|
|
||||||
extern struct apple_xgl_api __gl_api;
|
extern struct apple_xgl_api __ogl_framework_api;
|
||||||
|
|
||||||
struct apple_xgl_saved_state
|
struct apple_xgl_saved_state
|
||||||
{
|
{
|
||||||
|
@ -102,7 +102,7 @@ glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
|
||||||
|
|
||||||
SetRead(&saved);
|
SetRead(&saved);
|
||||||
|
|
||||||
__gl_api.ReadPixels(x, y, width, height, format, type, pixels);
|
__ogl_framework_api.ReadPixels(x, y, width, height, format, type, pixels);
|
||||||
|
|
||||||
UnsetRead(&saved);
|
UnsetRead(&saved);
|
||||||
}
|
}
|
||||||
|
@ -114,7 +114,7 @@ glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
|
||||||
|
|
||||||
SetRead(&saved);
|
SetRead(&saved);
|
||||||
|
|
||||||
__gl_api.CopyPixels(x, y, width, height, type);
|
__ogl_framework_api.CopyPixels(x, y, width, height, type);
|
||||||
|
|
||||||
UnsetRead(&saved);
|
UnsetRead(&saved);
|
||||||
}
|
}
|
||||||
|
@ -127,7 +127,7 @@ glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y,
|
||||||
|
|
||||||
SetRead(&saved);
|
SetRead(&saved);
|
||||||
|
|
||||||
__gl_api.CopyColorTable(target, internalformat, x, y, width);
|
__ogl_framework_api.CopyColorTable(target, internalformat, x, y, width);
|
||||||
|
|
||||||
UnsetRead(&saved);
|
UnsetRead(&saved);
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
#include "apple_glx_context.h"
|
#include "apple_glx_context.h"
|
||||||
#include "apple_xgl_api.h"
|
#include "apple_xgl_api.h"
|
||||||
|
|
||||||
extern struct apple_xgl_api __gl_api;
|
extern struct apple_xgl_api __ogl_framework_api;
|
||||||
/*
|
/*
|
||||||
* These are special functions for stereoscopic support
|
* These are special functions for stereoscopic support
|
||||||
* differences in MacOS X.
|
* differences in MacOS X.
|
||||||
|
@ -73,10 +73,10 @@ glDrawBuffer(GLenum mode)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
__gl_api.DrawBuffers(n, buf);
|
__ogl_framework_api.DrawBuffers(n, buf);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
__gl_api.DrawBuffer(mode);
|
__ogl_framework_api.DrawBuffer(mode);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -114,10 +114,10 @@ glDrawBuffers(GLsizei n, const GLenum * bufs)
|
||||||
newbuf[outi++] = GL_FRONT_RIGHT;
|
newbuf[outi++] = GL_FRONT_RIGHT;
|
||||||
}
|
}
|
||||||
|
|
||||||
__gl_api.DrawBuffers(outi, newbuf);
|
__ogl_framework_api.DrawBuffers(outi, newbuf);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
__gl_api.DrawBuffers(n, bufs);
|
__ogl_framework_api.DrawBuffers(n, bufs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include "apple_glx_context.h"
|
#include "apple_glx_context.h"
|
||||||
#include "apple_xgl_api.h"
|
#include "apple_xgl_api.h"
|
||||||
|
|
||||||
extern struct apple_xgl_api __gl_api;
|
extern struct apple_xgl_api __ogl_framework_api;
|
||||||
|
|
||||||
void
|
void
|
||||||
glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
|
glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
|
||||||
|
@ -42,5 +42,5 @@ glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
|
||||||
if (gc && gc->driContext)
|
if (gc && gc->driContext)
|
||||||
apple_glx_context_update(dpy, gc->driContext);
|
apple_glx_context_update(dpy, gc->driContext);
|
||||||
|
|
||||||
__gl_api.Viewport(x, y, width, height);
|
__ogl_framework_api.Viewport(x, y, width, height);
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,7 +121,7 @@ proc main {argc argv} {
|
||||||
#include "apple_glx_context.h"
|
#include "apple_glx_context.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
puts $fd "struct apple_xgl_api __gl_api;"
|
puts $fd "struct apple_xgl_api __ogl_framework_api;"
|
||||||
|
|
||||||
set sorted [lsort -dictionary [array names api]]
|
set sorted [lsort -dictionary [array names api]]
|
||||||
|
|
||||||
|
@ -176,7 +176,7 @@ proc main {argc argv} {
|
||||||
set alias [dict get $attr alias_for]
|
set alias [dict get $attr alias_for]
|
||||||
set body "[set return] gl[set alias]([set callvars]);"
|
set body "[set return] gl[set alias]([set callvars]);"
|
||||||
} else {
|
} else {
|
||||||
set body "[set return]__gl_api.[set f]([set callvars]);"
|
set body "[set return]__ogl_framework_api.[set f]([set callvars]);"
|
||||||
}
|
}
|
||||||
|
|
||||||
puts $fd "GLAPI [dict get $attr return] APIENTRY gl[set f]([set pstr]) \{\n\t$body\n\}"
|
puts $fd "GLAPI [dict get $attr return] APIENTRY gl[set f]([set pstr]) \{\n\t$body\n\}"
|
||||||
|
@ -201,7 +201,7 @@ proc main {argc argv} {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
puts $fd "\t__gl_api.$f = glsym(handle, \"gl$f\");"
|
puts $fd "\t__ogl_framework_api.$f = glsym(handle, \"gl$f\");"
|
||||||
}
|
}
|
||||||
|
|
||||||
puts $fd "\}\n"
|
puts $fd "\}\n"
|
||||||
|
|
Loading…
Reference in New Issue