/*
* Authors:
* Gareth Hughes <gareth@valinux.com>
- * Keith Whitwell <keith@tungstengraphics.com>
+ * Keith Whitwell <keithw@vmware.com>
* Kevin E. Martin <martin@valinux.com>
* Nicolai Haehnle <prefect_@gmx.net>
*/
#include "dri_util.h"
#include "drm.h"
#include "radeon_drm.h"
-#include "texmem.h"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/colormac.h"
typedef struct r100_context r100ContextRec;
typedef struct r100_context *r100ContextPtr;
-#include "radeon_lock.h"
-
#define R100_TEX_ALL 0x7
#define SHN_SHININESS 1
#define SHN_STATE_SIZE 2
+#define R100_QUERYOBJ_CMD_0 0
+#define R100_QUERYOBJ_DATA_0 1
+#define R100_QUERYOBJ_CMDSIZE 2
+
+#define STP_CMD_0 0
+#define STP_DATA_0 1
+#define STP_CMD_1 2
+#define STP_STATE_SIZE 35
+
struct r100_hw_state {
/* Hardware state, stored as cmdbuf commands:
* -- Need to doublebuffer for
struct radeon_state_atom fog;
struct radeon_state_atom glt;
struct radeon_state_atom txr[3]; /* for NPOT */
-
+ struct radeon_state_atom stp;
};
+struct radeon_stipple_state {
+ GLuint mask[32];
+};
struct r100_state {
struct radeon_stipple_state stipple;
GLuint NeedTexMatrix;
GLuint TexMatColSwap;
GLmatrix tmpmat[RADEON_MAX_TEXTURE_UNITS];
- GLuint last_ReallyEnabled;
/* radeon_tcl.c
*/
};
-#define R100_CONTEXT(ctx) ((r100ContextPtr)(ctx->DriverCtx))
+static inline r100ContextPtr
+R100_CONTEXT(struct gl_context *ctx)
+{
+ return (r100ContextPtr) ctx;
+}
+
#define RADEON_OLD_PACKETS 1
-extern GLboolean r100CreateContext( const __GLcontextModes *glVisual,
- __DRIcontextPrivate *driContextPriv,
+extern GLboolean r100CreateContext( gl_api api,
+ const struct gl_config *glVisual,
+ __DRIcontext *driContextPriv,
+ unsigned major_version,
+ unsigned minor_version,
+ uint32_t flags,
+ bool notify_reset,
+ unsigned *error,
void *sharedContextPrivate);
-
#endif /* __RADEON_CONTEXT_H__ */