summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/savage
diff options
context:
space:
mode:
authorFelix Kuehling <fxkuehl@gmx.de>2005-03-13 00:20:03 +0000
committerFelix Kuehling <fxkuehl@gmx.de>2005-03-13 00:20:03 +0000
commit4f05e61543b890682b265a6abd986a89ef024fbb (patch)
tree618c8e1f024310141b13fd68619cf12b3ad80750 /src/mesa/drivers/dri/savage
parent45f26f9979f19e1d15b78a5a3ef47092e6c9cbbf (diff)
Updated savage_dri.h from Xorg CVS. This removes definitions that are
not part of the DDX->DRI interface and should never have been in this file in the first place.
Diffstat (limited to 'src/mesa/drivers/dri/savage')
-rw-r--r--src/mesa/drivers/dri/savage/server/savage_dri.h81
1 files changed, 0 insertions, 81 deletions
diff --git a/src/mesa/drivers/dri/savage/server/savage_dri.h b/src/mesa/drivers/dri/savage/server/savage_dri.h
index 39b6564fc3..214d9851af 100644
--- a/src/mesa/drivers/dri/savage/server/savage_dri.h
+++ b/src/mesa/drivers/dri/savage/server/savage_dri.h
@@ -26,89 +26,8 @@
#ifndef __SAVAGE_DRI_H__
#define __SAVAGE_DRI_H__
-#include "xf86drm.h"
#include "drm.h"
-/* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
- * to 32 clients. */
-#define SAVAGE_NUM_BUFFERS 32
-#define SAVAGE_BUFFER_SIZE (1 << 16) /* 64k */
-
-#define SAVAGE_DEFAULT_AGP_MODE 1
-#define SAVAGE_MAX_AGP_MODE 4
-
-/* Buffer are aligned on 4096 byte boundaries.
- */
-/* this is used for backbuffer, depthbuffer, etc..*/
-/* alignment */
-
-#define SAVAGE_BUFFER_ALIGN 0x00000fff
-
-typedef struct{
- drm_context_t ctxOwner;
- unsigned long agp_offset;
- unsigned long agp_handle;
- unsigned long map_handle;
- int flags;
-} savageAgpBuffer , *savageAgpBufferPtr;
-
-typedef struct _server{
- int reserved_map_agpstart;
- int reserved_map_idx;
-
-#if 0
- int buffer_map_idx;
-#endif
-
- int sarea_priv_offset;
-
-#if 0
- int primary_size;
- int warp_ucode_size;
-#endif
-
- int chipset;
- int sgram; /* seems no use */
-
- unsigned int frontOffset;
- unsigned int frontPitch;
- unsigned int frontbufferSize;
- unsigned int frontBitmapDesc;
-
- unsigned int backOffset;
- unsigned int backPitch;
- unsigned int backbufferSize;
- unsigned int backBitmapDesc;
-
- unsigned int depthOffset;
- unsigned int depthPitch;
- unsigned int depthbufferSize;
- unsigned int depthBitmapDesc;
-
- unsigned int textureOffset;
- int textureSize;
- int logTextureGranularity;
-
- drmRegion agp;
-
- /* PCI mappings */
- drmRegion aperture;
- drmRegion registers;
- drmRegion status;
-
- /* AGP mappings */
- drmRegion buffers;
- drmRegion agpTextures;
- int logAgpTextureGranularity;
-
-#if 0
- drmBufMapPtr drmBuffers;
-#endif
- /*for agp*/
- int numBuffer;
- savageAgpBufferPtr agpBuffer;
-} SAVAGEDRIServerPrivateRec, *SAVAGEDRIServerPrivatePtr;
-
typedef struct {
int chipset;
int width;