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_glx_pixmap.c
diff --git
a/src/glx/apple/apple_glx_pixmap.c
b/src/glx/apple/apple_glx_pixmap.c
index af1791afb705c9c075d2cd5f67282679d68624f6..bee0ec98bef203793829224a3ed18be6f6a9b036 100644
(file)
--- a/
src/glx/apple/apple_glx_pixmap.c
+++ b/
src/glx/apple/apple_glx_pixmap.c
@@
-40,7
+40,7
@@
#include "apple_visual.h"
#include "apple_glx_drawable.h"
#include "appledri.h"
#include "apple_visual.h"
#include "apple_glx_drawable.h"
#include "appledri.h"
-#include "gl
contextmodes
.h"
+#include "gl
xconfig
.h"
static bool pixmap_make_current(struct apple_glx_context *ac,
struct apple_glx_drawable *d);
static bool pixmap_make_current(struct apple_glx_context *ac,
struct apple_glx_drawable *d);
@@
-80,8
+80,7
@@
pixmap_make_current(struct apple_glx_context *ac,
}
if (!ac->made_current) {
}
if (!ac->made_current) {
- glViewport(0, 0, p->width, p->height);
- glScissor(0, 0, p->width, p->height);
+ apple_glapi_oglfw_viewport_scissor(0, 0, p->width, p->height);
ac->made_current = true;
}
ac->made_current = true;
}
@@
-125,7
+124,7
@@
apple_glx_pixmap_create(Display * dpy, int screen, Pixmap pixmap,
bool double_buffered;
bool uses_stereo;
CGLError error;
bool double_buffered;
bool uses_stereo;
CGLError error;
- const
__GLcontextModes
*cmodes = mode;
+ const
struct glx_config
*cmodes = mode;
if (apple_glx_drawable_create(dpy, screen, pixmap, &d, &callbacks))
return true;
if (apple_glx_drawable_create(dpy, screen, pixmap, &d, &callbacks))
return true;