projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'lp-offset-twoside'
[mesa.git]
/
src
/
gallium
/
state_trackers
/
glx
/
xlib
/
xm_api.h
diff --git
a/src/gallium/state_trackers/glx/xlib/xm_api.h
b/src/gallium/state_trackers/glx/xlib/xm_api.h
index 4f2c8a6e6a9a8ddf25d9a1db3e159d99f421e56e..4ea42dc37559c74e6c4d6553dbc558578e75fac2 100644
(file)
--- a/
src/gallium/state_trackers/glx/xlib/xm_api.h
+++ b/
src/gallium/state_trackers/glx/xlib/xm_api.h
@@
-57,7
+57,7
@@
and create a window, you must do the following to use the X/Mesa interface:
#define XMESA_H
#define XMESA_H
-#include "main/
mtypes.h"
+#include "main/
core.h" /* for gl_config */
#include "state_tracker/st_api.h"
#include "os/os_thread.h"
#include "state_tracker/st_api.h"
#include "os/os_thread.h"
@@
-280,7
+280,8
@@
XMesaCopyContext(XMesaContext src, XMesaContext dst, unsigned long mask);
* Basically corresponds to an XVisualInfo.
*/
struct xmesa_visual {
* Basically corresponds to an XVisualInfo.
*/
struct xmesa_visual {
- GLvisual mesa_visual; /* Device independent visual parameters */
+ struct gl_config mesa_visual;/* Device independent visual parameters */
+ int screen, visualID, visualType;
Display *display; /* The X11 display */
XVisualInfo * visinfo; /* X's visual info (pointer to private copy) */
XVisualInfo *vishandle; /* Only used in fakeglx.c */
Display *display; /* The X11 display */
XVisualInfo * visinfo; /* X's visual info (pointer to private copy) */
XVisualInfo *vishandle; /* Only used in fakeglx.c */
@@
-350,6
+351,9
@@
struct xmesa_buffer {
+extern const char *
+xmesa_get_name(void);
+
extern void
xmesa_init(Display *dpy);
extern void
xmesa_init(Display *dpy);
@@
-360,6
+364,9
@@
extern void
xmesa_get_window_size(Display *dpy, XMesaBuffer b,
GLuint *width, GLuint *height);
xmesa_get_window_size(Display *dpy, XMesaBuffer b,
GLuint *width, GLuint *height);
+extern void
+xmesa_notify_invalid_buffer(XMesaBuffer b);
+
extern void
xmesa_check_buffer_size(XMesaBuffer b);
extern void
xmesa_check_buffer_size(XMesaBuffer b);
@@
-378,6
+385,6
@@
xmesa_buffer_height(XMesaBuffer b)
return b->height;
}
return b->height;
}
-
+extern boolean xmesa_strict_invalidate;
#endif
#endif