summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsap7@yahoo.gr>2007-04-06 13:28:39 +0300
committerGeorge Sapountzis <gsap7@yahoo.gr>2007-04-06 13:28:39 +0300
commit92b7fa7b48691e95d33bc0580cfad858782622ac (patch)
treedabb447a397f642543e867f0320942cdd17cf5d6 /src/mesa/drivers/x11
parenteb4a8b4bb556524df9a8db066c512385e96d8487 (diff)
xmesa: use newly added xm_image.[hc]
Keep external includes to glxheader.h and xmesa includes to xmesaP.h. Drop the following from xm_image.h: - dix-config.h (comes from glheader.h) - xfree86 includes (come from GL/xmesa_xf86.h) - ifdef __CYGWIN__ (leftover ? xm_api.c has something similar)
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r--src/mesa/drivers/x11/glxheader.h1
-rw-r--r--src/mesa/drivers/x11/xm_image.c13
-rw-r--r--src/mesa/drivers/x11/xm_image.h20
-rw-r--r--src/mesa/drivers/x11/xmesaP.h8
4 files changed, 13 insertions, 29 deletions
diff --git a/src/mesa/drivers/x11/glxheader.h b/src/mesa/drivers/x11/glxheader.h
index 8c5c69639b..a402191f13 100644
--- a/src/mesa/drivers/x11/glxheader.h
+++ b/src/mesa/drivers/x11/glxheader.h
@@ -36,7 +36,6 @@
# include "resource.h"
# include "windowstr.h"
-# include "xf86glx_util.h"
#else
diff --git a/src/mesa/drivers/x11/xm_image.c b/src/mesa/drivers/x11/xm_image.c
index 6af773f538..b91d5679f9 100644
--- a/src/mesa/drivers/x11/xm_image.c
+++ b/src/mesa/drivers/x11/xm_image.c
@@ -31,15 +31,14 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* Brian Paul <brian@precisioninsight.com>
*/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
#include <stdlib.h>
-
-#include "xf86glx_util.h"
#include <X11/Xmd.h>
+#include "glxheader.h"
+#include "xmesaP.h"
+
+#ifdef XFree86Server
+
#ifdef ROUNDUP
#undef ROUNDUP
#endif
@@ -147,3 +146,5 @@ void XMesaPutImageHelper(ScreenPtr display,
(*gc->ops->PutImage)(d, gc, d->depth, dest_x, dest_y, width, height,
0, ZPixmap, src);
}
+
+#endif /* XFree86Server */
diff --git a/src/mesa/drivers/x11/xm_image.h b/src/mesa/drivers/x11/xm_image.h
index bb314128d4..c91ab3935e 100644
--- a/src/mesa/drivers/x11/xm_image.h
+++ b/src/mesa/drivers/x11/xm_image.h
@@ -31,22 +31,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* Brian Paul <brian@precisioninsight.com>
*/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _XF86GLX_UTIL_H_
-#define _XF86GLX_UTIL_H_
-
-#ifdef __CYGWIN__
-#undef WIN32
-#undef _WIN32
-#endif
-
-#include <screenint.h>
-#include <pixmap.h>
-#include <gc.h>
-#include "GL/xmesa.h"
+#ifndef _XM_IMAGE_H_
+#define _XM_IMAGE_H_
#define XMESA_USE_PUTPIXEL_MACRO
@@ -102,4 +88,4 @@ extern void XMesaPutImageHelper(ScreenPtr display,
int dest_x, int dest_y,
unsigned int width, unsigned int height);
-#endif /* _XF86GLX_UTIL_H_ */
+#endif /* _XM_IMAGE_H_ */
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index 03acd4ca24..bd5dce1417 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -27,17 +27,15 @@
#define XMESAP_H
-#ifdef XFree86Server
-# include "xf86glx_util.h"
-#elif defined(USE_XSHM)
-# include <X11/extensions/XShm.h>
-#endif
#include "GL/xmesa.h"
#include "mtypes.h"
#if defined(FX)
#include "GL/fxmesa.h"
#include "../glide/fxdrv.h"
#endif
+#ifdef XFree86Server
+#include "xm_image.h"
+#endif
extern _glthread_Mutex _xmesa_lock;