AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused code, definitions.

Browse Source
This commit is contained in:
Keith Whitwell
2007-08-08 11:25:28 +01:00
parent f71edfa41b
commit 7f74538173
4 changed files with 5 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c
+1
View File
@@ -27,6 +27,7 @@
#include "intel_batchbuffer.h"
#include "intel_ioctl.h"
#include "intel_reg.h"
/* Relocations in kernel space:
* - pass dma buffer seperately
src/mesa/drivers/dri/intel_winsys/intel_context.h
-40
View File
@@ -40,21 +40,12 @@
#include "i830_common.h"
#define DV_PF_555 (1<<8)
#define DV_PF_565 (2<<8)
#define DV_PF_8888 (3<<8)
struct pipe_context;
struct pipe_region;
struct intel_context;
struct _DriBufferObject;
#define INTEL_WRITE_PART 0x1
#define INTEL_WRITE_FULL 0x2
#define INTEL_READ 0x4
#define INTEL_MAX_FIXUP 64
@@ -76,9 +67,6 @@ struct intel_context
char *prevLockFile;
int prevLockLine;
GLuint ClearColor565;
GLuint ClearColor8888;
/* These refer to the current drawing buffer:
*/
@@ -117,25 +105,6 @@ extern char *__progname;
*/
#define INTEL_FIREVERTICES(intel)
/* ================================================================
* Color packing:
*/
#define INTEL_PACKCOLOR4444(r,g,b,a) \
((((a) & 0xf0) << 8) | (((r) & 0xf0) << 4) | ((g) & 0xf0) | ((b) >> 4))
#define INTEL_PACKCOLOR1555(r,g,b,a) \
((((r) & 0xf8) << 7) | (((g) & 0xf8) << 2) | (((b) & 0xf8) >> 3) | \
((a) ? 0x8000 : 0))
#define INTEL_PACKCOLOR565(r,g,b) \
((((r) & 0xf8) << 8) | (((g) & 0xfc) << 3) | (((b) & 0xf8) >> 3))
#define INTEL_PACKCOLOR8888(r,g,b,a) \
((a<<24) | (r<<16) | (g<<8) | b)
/* ================================================================
* Debugging:
@@ -182,20 +151,11 @@ extern int INTEL_DEBUG;
* intel_context.c:
*/
extern GLboolean intelInitContext(struct intel_context *intel,
const __GLcontextModes * mesaVis,
__DRIcontextPrivate * driContextPriv,
void *sharedContextPrivate,
struct dd_function_table *functions);
extern void intelGetLock(struct intel_context *intel, GLuint flags);
extern void intelFinish(GLcontext * ctx);
extern void intelFlush(GLcontext * ctx);
#define MI_BATCH_BUFFER_END (0xA<<23)
#define FALLBACK( ctx, bit, mode )
/*======================================================================
src/mesa/drivers/dri/intel_winsys/intel_pipe_softpipe.c
+1 -4
View File
@@ -34,11 +34,8 @@
#include "dri_bufpool.h"
#include "dri_bufmgr.h"
/* #include "errno.h" */
/* #include "string.h" */
/* #include "imports.h" */
#include "intel_context.h"
#include "intel_pipe.h"
#include "pipe/softpipe/sp_winsys.h"
src/mesa/drivers/dri/intel_winsys/intel_reg.h
+3 -38
View File
@@ -30,44 +30,6 @@
#define _INTEL_REG_H_
#define CMD_3D (0x3<<29)
#define _3DPRIMITIVE ((0x3<<29)|(0x1f<<24))
#define PRIM_INDIRECT (1<<23)
#define PRIM_INLINE (0<<23)
#define PRIM_INDIRECT_SEQUENTIAL (0<<17)
#define PRIM_INDIRECT_ELTS (1<<17)
#define PRIM3D_TRILIST (0x0<<18)
#define PRIM3D_TRISTRIP (0x1<<18)
#define PRIM3D_TRISTRIP_RVRSE (0x2<<18)
#define PRIM3D_TRIFAN (0x3<<18)
#define PRIM3D_POLY (0x4<<18)
#define PRIM3D_LINELIST (0x5<<18)
#define PRIM3D_LINESTRIP (0x6<<18)
#define PRIM3D_RECTLIST (0x7<<18)
#define PRIM3D_POINTLIST (0x8<<18)
#define PRIM3D_DIB (0x9<<18)
#define PRIM3D_MASK (0x1f<<18)
#define I915PACKCOLOR4444(r,g,b,a) \
((((a) & 0xf0) << 8) | (((r) & 0xf0) << 4) | ((g) & 0xf0) | ((b) >> 4))
#define I915PACKCOLOR1555(r,g,b,a) \
((((r) & 0xf8) << 7) | (((g) & 0xf8) << 2) | (((b) & 0xf8) >> 3) | \
((a) ? 0x8000 : 0))
#define I915PACKCOLOR565(r,g,b) \
((((r) & 0xf8) << 8) | (((g) & 0xfc) << 3) | (((b) & 0xf8) >> 3))
#define I915PACKCOLOR8888(r,g,b,a) \
((a<<24) | (r<<16) | (g<<8) | b)
#define BR00_BITBLT_CLIENT 0x40000000
#define BR00_OP_COLOR_BLT 0x10000000
#define BR00_OP_SRC_COPY_BLT 0x10C00000
@@ -85,4 +47,7 @@
#define MI_WAIT_FOR_PLANE_B_FLIP (1<<6)
#define MI_WAIT_FOR_PLANE_A_FLIP (1<<2)
#define MI_BATCH_BUFFER_END (0xA<<23)
#endif