diff options
author | Adam Jackson <ajax@redhat.com> | 2010-11-29 17:37:54 -0500 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2010-11-29 17:37:54 -0500 |
commit | 1ccef926be46dce3b6b5c76e812e2fae4e205ce7 (patch) | |
tree | e317f277e47d3b624271f26a514a8db47085d4e5 /src/mesa/drivers/dri | |
parent | e5aa69f6a6779d1e0fb3d413ad7007b0fb90b176 (diff) |
drivers/x11: unifdef XFree86Server
This code was for the old GLcore build of the software rasteriser. The
X server switched to a DRI driver for software indirect GLX long ago.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r-- | src/mesa/drivers/dri/sis/server/sis_dri.h | 9 | ||||
-rw-r--r-- | src/mesa/drivers/dri/tdfx/tdfx_context.h | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/unichrome/server/via_dri.h | 2 |
3 files changed, 0 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/sis/server/sis_dri.h b/src/mesa/drivers/dri/sis/server/sis_dri.h index f0171f3c0f..7d8f507115 100644 --- a/src/mesa/drivers/dri/sis/server/sis_dri.h +++ b/src/mesa/drivers/dri/sis/server/sis_dri.h @@ -72,13 +72,4 @@ typedef struct { int dummy; } SISDRIContextRec, *SISDRIContextPtr; -#ifdef XFree86Server - -#include "screenint.h" - -Bool SISDRIScreenInit(ScreenPtr pScreen); -void SISDRICloseScreen(ScreenPtr pScreen); -Bool SISDRIFinishScreenInit(ScreenPtr pScreen); - -#endif #endif diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.h b/src/mesa/drivers/dri/tdfx/tdfx_context.h index fb38419dcd..7e2f0e00a8 100644 --- a/src/mesa/drivers/dri/tdfx/tdfx_context.h +++ b/src/mesa/drivers/dri/tdfx/tdfx_context.h @@ -41,11 +41,7 @@ #include <sys/time.h> #include "dri_util.h" -#ifdef XFree86Server -#include "GL/xf86glx.h" -#else #include "main/glheader.h" -#endif #if defined(__linux__) #include <signal.h> #endif diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.h b/src/mesa/drivers/dri/unichrome/server/via_dri.h index b47397d572..c6eed03c1c 100644 --- a/src/mesa/drivers/dri/unichrome/server/via_dri.h +++ b/src/mesa/drivers/dri/unichrome/server/via_dri.h @@ -35,9 +35,7 @@ #define VIA_DRIDDX_VERSION_MINOR 0 #define VIA_DRIDDX_VERSION_PATCH 0 -#ifndef XFree86Server typedef int Bool; -#endif typedef struct { drm_handle_t handle; |