OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #2428: #ifdef GLX_DIRECT_RENDERING in DRI drivers is pointless.

Browse Source
This commit is contained in:
Adam Jackson
2005-01-31 23:40:05 +00:00
parent fc4cabbfa8
commit 886280763c
65 changed files with 3 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/drivers/dri/Makefile.template
View File

@@ -48,11 +48,6 @@ SHARED_INCLUDES = \
-I$(TOP)/src/mesa/swrast \
-I$(TOP)/src/mesa/swrast_setup
# Of course we're direct rendering. Redundant #ifdefs in the code
# from prehistory require this:
#
DEFINES += -DGLX_DIRECT_RENDERING
##### RULES #####
.c.o:

4
src/mesa/drivers/dri/common/dri_util.c
View File

@@ -25,8 +25,6 @@
*/
#ifdef GLX_DIRECT_RENDERING
#include <assert.h>
#include <stdarg.h>
#include <unistd.h>
@@ -1689,5 +1687,3 @@ driCalculateSwapUsage( __DRIdrawablePrivate *dPriv, int64_t last_swap_ust,
}
/*@}*/
#endif /* GLX_DIRECT_RENDERING */

4
src/mesa/drivers/dri/common/dri_util.h
View File

@@ -49,8 +49,6 @@
#ifndef _DRI_UTIL_H_
#define _DRI_UTIL_H_
#ifdef GLX_DIRECT_RENDERING
#define CAPI /* XXX this should be globally defined somewhere */
#ifdef DRI_NEW_INTERFACE_ONLY
@@ -575,6 +573,4 @@ extern void
(*glXGetProcAddress(const GLubyte *procname))( void );
#endif
#endif /* GLX_DIRECT_RENDERING */
#endif /* _DRI_UTIL_H_ */

5
src/mesa/drivers/dri/ffb/ffb_xmesa.c
View File

@@ -25,8 +25,6 @@
* David S. Miller <davem@redhat.com>
*/
#ifdef GLX_DIRECT_RENDERING
#include "ffb_xmesa.h"
#include "context.h"
#include "matrix.h"
@@ -580,6 +578,3 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &ffbAPI);
return (void *) psp;
}
#endif /* GLX_DIRECT_RENDERING */

4
src/mesa/drivers/dri/ffb/ffb_xmesa.h
View File

@@ -3,8 +3,6 @@
#ifndef _FFB_XMESA_H_
#define _FFB_XMESA_H_
#ifdef GLX_DIRECT_RENDERING
#include <sys/time.h>
#include "dri_util.h"
#include "mtypes.h"
@@ -25,6 +23,4 @@ typedef struct {
int rp_active;
} ffbScreenPrivate;
#endif /* GLX_DIRECT_RENDERING */
#endif /* !(_FFB_XMESA_H) */

4
src/mesa/drivers/dri/gamma/gamma_lock.h
View File

@@ -1,8 +1,6 @@
#ifndef __GAMMA_LOCK_H__
#define __GAMMA_LOCK_H__
#ifdef GLX_DIRECT_RENDERING
extern void gammaGetLock( gammaContextPtr gmesa, GLuint flags );
/* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -72,8 +70,6 @@ extern int prevLockLine;
DEBUG_RESET(); \
} while (0)
#endif
#define GAMMAHW_LOCK( gmesa ) \
DRM_UNLOCK(gmesa->driFd, gmesa->driHwLock, gmesa->hHWContext); \
DRM_SPINLOCK(&gmesa->driScreen->pSAREA->drawable_lock, \

4
src/mesa/drivers/dri/gamma/gamma_macros.h
View File

@@ -35,8 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef _GAMMA_MACROS_H_
#define _GAMMA_MACROS_H_
#ifdef GLX_DIRECT_RENDERING
#define DEBUG_DRMDMA
#define DEBUG_ERRORS
#define DEBUG_COMMANDS_NOT
@@ -323,6 +321,4 @@ do { \
while (__s > 1) { ++l2; __s >>= 1; } \
} while (0)
#endif
#endif /* _GAMMA_MACROS_H_ */

3
src/mesa/drivers/dri/mach64/mach64_context.h
View File

@@ -32,8 +32,6 @@
#ifndef __MACH64_CONTEXT_H__
#define __MACH64_CONTEXT_H__
#ifdef GLX_DIRECT_RENDERING
#include "dri_util.h"
#include "drm.h"
#include "mach64_drm.h"
@@ -403,5 +401,4 @@ extern int MACH64_DEBUG;
#define DEBUG_VERBOSE_PRIMS 0x040
#define DEBUG_VERBOSE_COUNT 0x080
#define DEBUG_NOWAIT 0x100
#endif
#endif /* __MACH64_CONTEXT_H__ */

3
src/mesa/drivers/dri/mach64/mach64_dd.h
View File

@@ -31,9 +31,6 @@
#ifndef __MACH64_DD_H__
#define __MACH64_DD_H__
#ifdef GLX_DIRECT_RENDERING
extern void mach64InitDriverFuncs( struct dd_function_table *functions );
#endif
#endif

3
src/mesa/drivers/dri/mach64/mach64_ioctl.h
View File

@@ -32,8 +32,6 @@
#ifndef __MACH64_IOCTL_H__
#define __MACH64_IOCTL_H__
#ifdef GLX_DIRECT_RENDERING
#include "mach64_dri.h"
#include "mach64_reg.h"
#include "mach64_lock.h"
@@ -147,5 +145,4 @@ do { \
} while (0)
#endif
#endif /* __MACH64_IOCTL_H__ */

3
src/mesa/drivers/dri/mach64/mach64_lock.h
View File

@@ -31,8 +31,6 @@
#ifndef __MACH64_LOCK_H__
#define __MACH64_LOCK_H__
#ifdef GLX_DIRECT_RENDERING
extern void mach64GetLock( mach64ContextPtr mmesa, GLuint flags );
@@ -103,5 +101,4 @@ extern int prevLockLine;
DEBUG_RESET(); \
} while (0)
#endif
#endif /* __MACH64_LOCK_H__ */

3
src/mesa/drivers/dri/mach64/mach64_reg.h
View File

@@ -32,8 +32,6 @@
#ifndef __MACH64_REG_H__
#define __MACH64_REG_H__
#ifdef GLX_DIRECT_RENDERING
/*
* Not sure how this compares with the G200, but the Rage Pro has two
* banks of registers, with bank 0 at (aperture base + memmap offset - 1KB)
@@ -405,5 +403,4 @@
#define MACH64_LAST_FRAME_REG MACH64_PAT_REG0
#define MACH64_LAST_DISPATCH_REG MACH64_PAT_REG1
#endif
#endif /* __MACH64_REG_H__ */

3
src/mesa/drivers/dri/mach64/mach64_screen.h
View File

@@ -32,8 +32,6 @@
#ifndef __MACH64_SCREEN_H__
#define __MACH64_SCREEN_H__
#ifdef GLX_DIRECT_RENDERING
#include "xmlconfig.h"
typedef struct {
@@ -77,5 +75,4 @@ typedef struct {
driOptionCache optionCache;
} mach64ScreenRec, *mach64ScreenPtr;
#endif
#endif /* __MACH64_SCREEN_H__ */

3
src/mesa/drivers/dri/mach64/mach64_span.h
View File

@@ -31,9 +31,6 @@
#ifndef __MACH64_SPAN_H__
#define __MACH64_SPAN_H__
#ifdef GLX_DIRECT_RENDERING
extern void mach64DDInitSpanFuncs( GLcontext *ctx );
#endif
#endif

3
src/mesa/drivers/dri/mach64/mach64_state.h
View File

@@ -31,8 +31,6 @@
#ifndef __MACH64_STATE_H__
#define __MACH64_STATE_H__
#ifdef GLX_DIRECT_RENDERING
#include "mach64_context.h"
extern void mach64DDInitState( mach64ContextPtr mmesa );
@@ -47,4 +45,3 @@ extern void mach64DDUpdateHWState( GLcontext *ctx );
extern void mach64EmitHwStateLocked( mach64ContextPtr mmesa );
#endif
#endif

3
src/mesa/drivers/dri/mach64/mach64_tex.h
View File

@@ -32,8 +32,6 @@
#ifndef __MACH64_TEX_H__
#define __MACH64_TEX_H__
#ifdef GLX_DIRECT_RENDERING
extern void mach64UpdateTextureState( GLcontext *ctx );
extern void mach64SwapOutTexObj( mach64ContextPtr mach64ctx,
@@ -99,4 +97,3 @@ static __inline__ GLuint mach64PackColor( GLuint cpp,
}
#endif
#endif

3
src/mesa/drivers/dri/mga/mga_xmesa.h
View File

@@ -29,8 +29,6 @@
#ifndef _MGA_INIT_H_
#define _MGA_INIT_H_
#ifdef GLX_DIRECT_RENDERING
#include <sys/time.h>
#include "dri_util.h"
#include "mga_drm.h"
@@ -149,4 +147,3 @@ do { \
#define MGA_WRITE( reg, val ) do { MGA_DEREF( reg ) = val; } while (0)
#endif
#endif

3
src/mesa/drivers/dri/r128/r128_context.h
View File

@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R128_CONTEXT_H__
#define __R128_CONTEXT_H__
#ifdef GLX_DIRECT_RENDERING
#include "dri_util.h"
#include "drm.h"
#include "r128_drm.h"
@@ -268,5 +266,4 @@ extern int R128_DEBUG;
#define DEBUG_VERBOSE_2D 0x40
#define DEBUG_VERBOSE_FALL 0x80
#endif
#endif /* __R128_CONTEXT_H__ */

3
src/mesa/drivers/dri/r128/r128_dd.h
View File

@@ -36,9 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R128_DD_H__
#define __R128_DD_H__
#ifdef GLX_DIRECT_RENDERING
extern void r128InitDriverFuncs( struct dd_function_table *functions );
#endif
#endif

3
src/mesa/drivers/dri/r128/r128_ioctl.h
View File

@@ -35,8 +35,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R128_IOCTL_H__
#define __R128_IOCTL_H__
#ifdef GLX_DIRECT_RENDERING
#include "r128_dri.h"
#include "r128_reg.h"
#include "r128_lock.h"
@@ -143,5 +141,4 @@ do { \
UNLOCK_HARDWARE( rmesa ); \
} while (0)
#endif
#endif /* __R128_IOCTL_H__ */

3
src/mesa/drivers/dri/r128/r128_lock.h
View File

@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R128_LOCK_H__
#define __R128_LOCK_H__
#ifdef GLX_DIRECT_RENDERING
extern void r128GetLock( r128ContextPtr rmesa, GLuint flags );
/* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -107,5 +105,4 @@ extern int prevLockLine;
DEBUG_RESET(); \
} while (0)
#endif
#endif /* __R128_LOCK_H__ */

3
src/mesa/drivers/dri/r128/r128_screen.h
View File

@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R128_SCREEN_H__
#define __R128_SCREEN_H__
#ifdef GLX_DIRECT_RENDERING
#include "xmlconfig.h"
typedef struct {
@@ -83,5 +81,4 @@ typedef struct {
} r128ScreenRec, *r128ScreenPtr;
#endif
#endif /* __R128_SCREEN_H__ */

3
src/mesa/drivers/dri/r128/r128_span.h
View File

@@ -36,9 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R128_SPAN_H__
#define __R128_SPAN_H__
#ifdef GLX_DIRECT_RENDERING
extern void r128DDInitSpanFuncs( GLcontext *ctx );
#endif
#endif

3
src/mesa/drivers/dri/r128/r128_state.h
View File

@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R128_STATE_H__
#define __R128_STATE_H__
#ifdef GLX_DIRECT_RENDERING
#include "r128_context.h"
extern void r128DDInitState( r128ContextPtr rmesa );
@@ -51,4 +49,3 @@ extern void r128UpdateWindow( GLcontext *ctx );
extern void r128EmitHwStateLocked( r128ContextPtr rmesa );
#endif
#endif

3
src/mesa/drivers/dri/r128/r128_tex.h
View File

@@ -36,8 +36,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R128_TEX_H__
#define __R128_TEX_H__
#ifdef GLX_DIRECT_RENDERING
extern void r128UpdateTextureState( GLcontext *ctx );
extern void r128UploadTexImages( r128ContextPtr rmesa, r128TexObjPtr t );
@@ -84,5 +82,4 @@ static __inline__ u_int32_t r128PackColor( GLuint cpp,
}
}
#endif
#endif /* __R128_TEX_H__ */

3
src/mesa/drivers/dri/r200/r200_context.h
View File

@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_CONTEXT_H__
#define __R200_CONTEXT_H__
#ifdef GLX_DIRECT_RENDERING
#include "tnl/t_vertex.h"
#include "drm.h"
#include "radeon_drm.h"
@@ -990,5 +988,4 @@ extern int R200_DEBUG;
#define DEBUG_PIXEL 0x2000
#define DEBUG_MEMORY 0x4000
#endif
#endif /* __R200_CONTEXT_H__ */

6
src/mesa/drivers/dri/r200/r200_ioctl.h
View File

@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_IOCTL_H__
#define __R200_IOCTL_H__
#ifdef GLX_DIRECT_RENDERING
#include "simple_list.h"
#include "radeon_dri.h"
#include "r200_lock.h"
@@ -214,8 +212,4 @@ static __inline char *r200AllocCmdBuf( r200ContextPtr rmesa,
return head;
}
#endif
#endif /* __R200_IOCTL_H__ */

3
src/mesa/drivers/dri/r200/r200_lock.h
View File

@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_LOCK_H__
#define __R200_LOCK_H__
#ifdef GLX_DIRECT_RENDERING
extern void r200GetLock( r200ContextPtr rmesa, GLuint flags );
/* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -106,5 +104,4 @@ extern int prevLockLine;
DEBUG_RESET(); \
} while (0)
#endif
#endif /* __R200_LOCK_H__ */

3
src/mesa/drivers/dri/r200/r200_maos.h
View File

@@ -36,12 +36,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_MAOS_H__
#define __R200_MAOS_H__
#ifdef GLX_DIRECT_RENDERING
#include "r200_context.h"
extern void r200EmitArrays( GLcontext *ctx, GLuint inputs );
extern void r200ReleaseArrays( GLcontext *ctx, GLuint newinputs );
#endif
#endif

3
src/mesa/drivers/dri/r200/r200_pixel.h
View File

@@ -35,9 +35,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_PIXEL_H__
#define __R200_PIXEL_H__
#ifdef GLX_DIRECT_RENDERING
extern void r200InitPixelFuncs( GLcontext *ctx );
#endif
#endif

3
src/mesa/drivers/dri/r200/r200_screen.h
View File

@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_SCREEN_H__
#define __R200_SCREEN_H__
#ifdef GLX_DIRECT_RENDERING
#include "xf86drm.h"
#include "drm.h"
#include "radeon_drm.h"
@@ -103,5 +101,4 @@ typedef struct {
driOptionCache optionCache;
} r200ScreenRec, *r200ScreenPtr;
#endif
#endif /* __R200_SCREEN_H__ */

3
src/mesa/drivers/dri/r200/r200_span.h
View File

@@ -36,9 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_SPAN_H__
#define __R200_SPAN_H__
#ifdef GLX_DIRECT_RENDERING
extern void r200InitSpanFuncs( GLcontext *ctx );
#endif
#endif

3
src/mesa/drivers/dri/r200/r200_state.h
View File

@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_STATE_H__
#define __R200_STATE_H__
#ifdef GLX_DIRECT_RENDERING
#include "r200_context.h"
extern void r200InitState( r200ContextPtr rmesa );
@@ -67,4 +65,3 @@ extern void r200Fallback( GLcontext *ctx, GLuint bit, GLboolean mode );
extern void r200LightingSpaceChange( GLcontext *ctx );
#endif
#endif

4
src/mesa/drivers/dri/r200/r200_tcl.h
View File

@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_TCL_H__
#define __R200_TCL_H__
#ifdef GLX_DIRECT_RENDERING
#include "r200_context.h"
extern void r200TclPrimitive( GLcontext *ctx, GLenum prim, int hw_prim );
@@ -68,6 +66,4 @@ extern float r200ComputeFogBlendFactor( GLcontext *ctx, GLfloat fogcoord );
#define TCL_FALLBACK( ctx, bit, mode ) r200TclFallback( ctx, bit, mode )
#endif
#endif

3
src/mesa/drivers/dri/r200/r200_tex.h
View File

@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_TEX_H__
#define __R200_TEX_H__
#ifdef GLX_DIRECT_RENDERING
extern void r200UpdateTextureState( GLcontext *ctx );
extern int r200UploadTexImages( r200ContextPtr rmesa, r200TexObjPtr t, GLuint face );
@@ -46,5 +44,4 @@ extern void r200DestroyTexObj( r200ContextPtr rmesa, r200TexObjPtr t );
extern void r200InitTextureFuncs( struct dd_function_table *functions );
#endif
#endif /* __R200_TEX_H__ */

4
src/mesa/drivers/dri/r200/r200_vtxfmt.h
View File

@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __R200_VTXFMT_H__
#define __R200_VTXFMT_H__
#ifdef GLX_DIRECT_RENDERING
#include "r200_context.h"
@@ -122,6 +120,4 @@ struct dynfn *r200_makeX86MultiTexCoord2fvARB( GLcontext *, const int * );
struct dynfn *r200_makeX86MultiTexCoord1fARB( GLcontext *, const int * );
struct dynfn *r200_makeX86MultiTexCoord1fvARB( GLcontext *, const int * );
#endif
#endif

3
src/mesa/drivers/dri/radeon/radeon_context.h
View File

@@ -38,8 +38,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __RADEON_CONTEXT_H__
#define __RADEON_CONTEXT_H__
#ifdef GLX_DIRECT_RENDERING
#include "dri_util.h"
#include "drm.h"
#include "radeon_drm.h"
@@ -850,5 +848,4 @@ extern int RADEON_DEBUG;
#define DEBUG_SANITY 0x800
#define DEBUG_SYNC 0x1000
#endif
#endif /* __RADEON_CONTEXT_H__ */

6
src/mesa/drivers/dri/radeon/radeon_ioctl.h
View File

@@ -37,8 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __RADEON_IOCTL_H__
#define __RADEON_IOCTL_H__
#ifdef GLX_DIRECT_RENDERING
#include "simple_list.h"
#include "radeon_lock.h"
@@ -216,8 +214,4 @@ static __inline char *radeonAllocCmdBuf( radeonContextPtr rmesa,
}
}
#endif
#endif /* __RADEON_IOCTL_H__ */

3
src/mesa/drivers/dri/radeon/radeon_lock.h
View File

@@ -37,8 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __RADEON_LOCK_H__
#define __RADEON_LOCK_H__
#ifdef GLX_DIRECT_RENDERING
extern void radeonGetLock( radeonContextPtr rmesa, GLuint flags );
/* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -107,5 +105,4 @@ extern int prevLockLine;
DEBUG_RESET(); \
} while (0)
#endif
#endif /* __RADEON_LOCK_H__ */

3
src/mesa/drivers/dri/radeon/radeon_maos.h
View File

@@ -36,12 +36,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __RADEON_MAOS_H__
#define __RADEON_MAOS_H__
#ifdef GLX_DIRECT_RENDERING
#include "radeon_context.h"
extern void radeonEmitArrays( GLcontext *ctx, GLuint inputs );
extern void radeonReleaseArrays( GLcontext *ctx, GLuint newinputs );
#endif
#endif

3
src/mesa/drivers/dri/radeon/radeon_screen.h
View File

@@ -37,8 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __RADEON_SCREEN_H__
#define __RADEON_SCREEN_H__
#ifdef GLX_DIRECT_RENDERING
/*
* IMPORTS: these headers contain all the DRI, X and kernel-related
* definitions that we need.
@@ -105,5 +103,4 @@ typedef struct {
extern radeonScreenPtr radeonCreateScreen( __DRIscreenPrivate *sPriv );
extern void radeonDestroyScreen( __DRIscreenPrivate *sPriv );
#endif
#endif /* __RADEON_SCREEN_H__ */

3
src/mesa/drivers/dri/radeon/radeon_span.h
View File

@@ -37,9 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __RADEON_SPAN_H__
#define __RADEON_SPAN_H__
#ifdef GLX_DIRECT_RENDERING
extern void radeonInitSpanFuncs( GLcontext *ctx );
#endif
#endif

3
src/mesa/drivers/dri/radeon/radeon_state.h
View File

@@ -38,8 +38,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __RADEON_STATE_H__
#define __RADEON_STATE_H__
#ifdef GLX_DIRECT_RENDERING
#include "radeon_context.h"
extern void radeonInitState( radeonContextPtr rmesa );
@@ -74,4 +72,3 @@ extern void radeonFallback( GLcontext *ctx, GLuint bit, GLboolean mode );
#define TEXMAT_2 5
#endif
#endif

4
src/mesa/drivers/dri/radeon/radeon_tcl.h
View File

@@ -37,8 +37,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __RADEON_TCL_H__
#define __RADEON_TCL_H__
#ifdef GLX_DIRECT_RENDERING
#include "radeon_context.h"
extern void radeonTclPrimitive( GLcontext *ctx, GLenum prim, int hw_prim );
@@ -65,6 +63,4 @@ extern void radeonTclFallback( GLcontext *ctx, GLuint bit, GLboolean mode );
#define TCL_FALLBACK( ctx, bit, mode ) radeonTclFallback( ctx, bit, mode )
#endif
#endif

3
src/mesa/drivers/dri/radeon/radeon_tex.h
View File

@@ -38,8 +38,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __RADEON_TEX_H__
#define __RADEON_TEX_H__
#ifdef GLX_DIRECT_RENDERING
extern void radeonUpdateTextureState( GLcontext *ctx );
extern int radeonUploadTexImages( radeonContextPtr rmesa, radeonTexObjPtr t,
@@ -49,5 +47,4 @@ extern void radeonDestroyTexObj( radeonContextPtr rmesa, radeonTexObjPtr t );
extern void radeonInitTextureFuncs( struct dd_function_table *functions );
#endif
#endif /* __RADEON_TEX_H__ */

4
src/mesa/drivers/dri/radeon/radeon_vtxfmt.h
View File

@@ -36,8 +36,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __RADEON_VTXFMT_H__
#define __RADEON_VTXFMT_H__
#ifdef GLX_DIRECT_RENDERING
#include "radeon_context.h"
@@ -119,6 +117,4 @@ struct dynfn *radeon_makeX86MultiTexCoord2fvARB( GLcontext *, int );
struct dynfn *radeon_makeX86MultiTexCoord1fARB( GLcontext *, int );
struct dynfn *radeon_makeX86MultiTexCoord1fvARB( GLcontext *, int );
#endif
#endif

4
src/mesa/drivers/dri/s3v/s3v_lock.h
View File

@@ -7,8 +7,6 @@
#include <sys/ioctl.h>
#ifdef GLX_DIRECT_RENDERING
extern void s3vGetLock( s3vContextPtr vmesa, GLuint flags );
/* Turn DEBUG_LOCKING on to find locking conflicts.
@@ -78,8 +76,6 @@ extern int prevLockLine;
DEBUG_RESET(); \
} while (0)
#endif
#define S3VHW_LOCK( vmesa ) \
DRM_UNLOCK(vmesa->driFd, vmesa->driHwLock, vmesa->hHWContext); \
DRM_SPINLOCK(&vmesa->driScreen->pSAREA->drawable_lock, \

4
src/mesa/drivers/dri/s3v/s3v_macros.h
View File

@@ -5,8 +5,6 @@
#ifndef _S3V_MACROS_H_
#define _S3V_MACROS_H_
#ifdef GLX_DIRECT_RENDERING
/**************/
/* DRI macros */
/**************/
@@ -204,8 +202,6 @@ do { \
DEBUG(("GOING HOME\n")); \
} while (0)
#endif
/**************************/
/* generic, global macros */
/**************************/

3
src/mesa/drivers/dri/savage/savage_init.h
View File

@@ -26,8 +26,6 @@
#ifndef _SAVAGE_INIT_H_
#define _SAVAGE_INIT_H_
#ifdef GLX_DIRECT_RENDERING
#include <sys/time.h>
#include "dri_util.h"
#include "mtypes.h"
@@ -160,4 +158,3 @@ enum S3CHIPTAGS {
};
#endif
#endif

4
src/mesa/drivers/dri/savage/savage_xmesa.c
View File

@@ -23,8 +23,6 @@
*/
#ifdef GLX_DIRECT_RENDERING
#include <X11/Xlibint.h>
#include <stdio.h>
@@ -940,5 +938,3 @@ void * __driCreateNewScreen( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc
return (void *) psp;
}
#endif /* USE_NEW_INTERFACE */
#endif

2
src/mesa/drivers/dri/sis/sis_common2.h
View File

@@ -44,7 +44,6 @@ extern void *sis_debug_malloc(int x);
#include "sis_debug.h"
#endif
#ifdef GLX_DIRECT_RENDERING
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -55,7 +54,6 @@ typedef struct _Box
BoxRec;
#define NullBox ((BoxPtr)0)
typedef struct _Box *BoxPtr;
#endif /* GLX_DIRECT_RENDERING */
/* BitBlt Commands */
#define CMD0_DD_ENABLE 0x06

3
src/mesa/drivers/dri/sis/sis_dd.h
View File

@@ -32,11 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __SIS_DD_H__
#define __SIS_DD_H__
#ifdef GLX_DIRECT_RENDERING
extern void sisUpdateBufferSize( sisContextPtr smesa );
extern void sisInitDriverFuncs( struct dd_function_table *functions );
#endif
#endif

3
src/mesa/drivers/dri/sis/sis_span.h
View File

@@ -32,12 +32,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __SIS_SPAN_H__
#define __SIS_SPAN_H__
#ifdef GLX_DIRECT_RENDERING
extern void sisSpanRenderStart( GLcontext *ctx );
extern void sisSpanRenderFinish( GLcontext *ctx );
extern void sisDDInitSpanFuncs( GLcontext *ctx );
#endif
#endif

3
src/mesa/drivers/dri/sis/sis_state.h
View File

@@ -32,8 +32,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __SIS_STATE_H__
#define __SIS_STATE_H__
#ifdef GLX_DIRECT_RENDERING
#include "sis_context.h"
extern void sisDDInitState( sisContextPtr smesa );
@@ -54,4 +52,3 @@ extern void sisDDDrawBuffer( GLcontext *ctx, GLenum mode );
extern void sisUpdateHWState( GLcontext *ctx );
#endif
#endif

3
src/mesa/drivers/dri/sis/sis_stencil.h
View File

@@ -32,9 +32,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __SIS_STENCIL_H__
#define __SIS_STENCIL_H__
#ifdef GLX_DIRECT_RENDERING
extern void sisDDInitStencilFuncs( GLcontext *ctx );
#endif
#endif

3
src/mesa/drivers/dri/sis/sis_tex.h
View File

@@ -32,10 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef __SIS_TEX_H__
#define __SIS_TEX_H__
#ifdef GLX_DIRECT_RENDERING
extern void sisInitTextureFuncs( struct dd_function_table *table );
extern void sisUpdateTextureState( GLcontext *ctx );
#endif /* GLX_DIRECT_RENDERING */
#endif /* __SIS_TEX_H__ */

3
src/mesa/drivers/dri/tdfx/dri_glide.h
View File

@@ -37,8 +37,6 @@
#ifndef __DRI_GLIDE_H__
#define __DRI_GLIDE_H__
#ifdef GLX_DIRECT_RENDERING
#include <glide.h>
#include "dri_mesaint.h"
@@ -60,4 +58,3 @@ extern void grDRIInvalidateAll( void );
extern void grDRIResetSAREA( void );
extern void grDRIBufferSwap( FxU32 swapInterval );
#endif
#endif

4
src/mesa/drivers/dri/tdfx/tdfx_context.h
View File

@@ -40,8 +40,6 @@
#ifndef __TDFX_CONTEXT_H__
#define __TDFX_CONTEXT_H__
#ifdef GLX_DIRECT_RENDERING
#include <sys/time.h>
#include "dri_util.h"
#ifdef XFree86Server
@@ -1005,6 +1003,4 @@ extern int TDFX_DEBUG;
#define FX_COMPRESS_S3TC_AS_FXT1_HACK 1
#define FX_TC_NAPALM 0
#endif /* GLX_DIRECT_RENDERING */
#endif /* __TDFX_CONTEXT_H__ */

3
src/mesa/drivers/dri/tdfx/tdfx_dd.h
View File

@@ -37,12 +37,9 @@
#ifndef __TDFX_DD_H__
#define __TDFX_DD_H__
#ifdef GLX_DIRECT_RENDERING
#include "context.h"
extern void tdfxDDInitDriverFuncs( const __GLcontextModes *visual,
struct dd_function_table *functions );
#endif
#endif

5
src/mesa/drivers/dri/tdfx/tdfx_lock.h
View File

@@ -37,8 +37,6 @@
#ifndef __TDFX_LOCK_H__
#define __TDFX_LOCK_H__
#ifdef GLX_DIRECT_RENDERING
/* You can turn this on to find locking conflicts.
*/
#define DEBUG_LOCKING 0
@@ -143,7 +141,4 @@ extern void tdfxGetLock( tdfxContextPtr fxMesa );
UNLOCK_HARDWARE( fxMesa ); \
} while (0)
#endif /* GLX_DIRECT_RENDERING */
#endif /* __TDFX_LOCK_H__ */

3
src/mesa/drivers/dri/tdfx/tdfx_pixels.h
View File

@@ -39,8 +39,6 @@
#ifndef __TDFX_PIXELS_H__
#define __TDFX_PIXELS_H__
#ifdef GLX_DIRECT_RENDERING
#include "context.h"
extern void
@@ -77,4 +75,3 @@ tdfx_drawpixels_R8G8B8A8( GLcontext *ctx, GLint x, GLint y,
const GLvoid *pixels );
#endif
#endif

4
src/mesa/drivers/dri/tdfx/tdfx_render.h
View File

@@ -37,8 +37,6 @@
#ifndef __TDFX_RENDER_H__
#define __TDFX_RENDER_H__
#ifdef GLX_DIRECT_RENDERING
#include "tdfx_context.h"
extern void tdfxInitRenderFuncs( struct dd_function_table *functions );
@@ -49,6 +47,4 @@ extern void tdfxUploadClipping( tdfxContextPtr fxMesa );
#define FLUSH_BATCH( fxMesa )
#endif
#endif

3
src/mesa/drivers/dri/tdfx/tdfx_screen.h
View File

@@ -37,8 +37,6 @@
#ifndef __TDFX_SCREEN_H__
#define __TDFX_SCREEN_H__
#ifdef GLX_DIRECT_RENDERING
typedef struct {
drm_handle_t handle;
drmSize size;
@@ -70,4 +68,3 @@ typedef struct {
#endif
#endif

3
src/mesa/drivers/dri/tdfx/tdfx_span.h
View File

@@ -38,11 +38,8 @@
#ifndef __TDFX_SPAN_H__
#define __TDFX_SPAN_H__
#ifdef GLX_DIRECT_RENDERING
#include "context.h"
extern void tdfxDDInitSpanFuncs( GLcontext *ctx );
#endif
#endif

3
src/mesa/drivers/dri/tdfx/tdfx_state.h
View File

@@ -38,8 +38,6 @@
#ifndef __TDFX_STATE_H__
#define __TDFX_STATE_H__
#ifdef GLX_DIRECT_RENDERING
#include "context.h"
#include "tdfx_context.h"
@@ -61,4 +59,3 @@ extern void tdfxUpdateViewport( GLcontext *ctx );
#endif
#endif