projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/vec4: Combine generate_math[12]_gen6 methods.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
radeon
/
radeon_context.h
diff --git
a/src/mesa/drivers/dri/radeon/radeon_context.h
b/src/mesa/drivers/dri/radeon/radeon_context.h
index dfedc38bfd1e3bfb142c9c33bf0dba3a1392fe9c..403253278133b5b0bbcbcc5cb2cb69655855c9b0 100644
(file)
--- a/
src/mesa/drivers/dri/radeon/radeon_context.h
+++ b/
src/mesa/drivers/dri/radeon/radeon_context.h
@@
-35,7
+35,7
@@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/*
* Authors:
* Gareth Hughes <gareth@valinux.com>
/*
* Authors:
* Gareth Hughes <gareth@valinux.com>
- * Keith Whitwell <keith
@tungstengraphics
.com>
+ * Keith Whitwell <keith
w@vmware
.com>
* Kevin E. Martin <martin@valinux.com>
* Nicolai Haehnle <prefect_@gmx.net>
*/
* Kevin E. Martin <martin@valinux.com>
* Nicolai Haehnle <prefect_@gmx.net>
*/
@@
-47,7
+47,6
@@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "dri_util.h"
#include "drm.h"
#include "radeon_drm.h"
#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"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/colormac.h"
@@
-60,8
+59,6
@@
struct r100_context;
typedef struct r100_context r100ContextRec;
typedef struct r100_context *r100ContextPtr;
typedef struct r100_context r100ContextRec;
typedef struct r100_context *r100ContextPtr;
-#include "radeon_lock.h"
-
#define R100_TEX_ALL 0x7
#define R100_TEX_ALL 0x7
@@
-419,7
+416,6
@@
struct r100_context {
GLuint NeedTexMatrix;
GLuint TexMatColSwap;
GLmatrix tmpmat[RADEON_MAX_TEXTURE_UNITS];
GLuint NeedTexMatrix;
GLuint TexMatColSwap;
GLmatrix tmpmat[RADEON_MAX_TEXTURE_UNITS];
- GLuint last_ReallyEnabled;
/* radeon_tcl.c
*/
/* radeon_tcl.c
*/
@@
-445,15
+441,25
@@
struct r100_context {
};
};
-#define R100_CONTEXT(ctx) ((r100ContextPtr)(ctx->DriverCtx))
+static inline r100ContextPtr
+R100_CONTEXT(struct gl_context *ctx)
+{
+ return (r100ContextPtr) ctx;
+}
+
#define RADEON_OLD_PACKETS 1
#define RADEON_OLD_PACKETS 1
-extern GLboolean r100CreateContext( const __GLcontextModes *glVisual,
+extern GLboolean r100CreateContext( gl_api api,
+ const struct gl_config *glVisual,
__DRIcontext *driContextPriv,
__DRIcontext *driContextPriv,
+ unsigned major_version,
+ unsigned minor_version,
+ uint32_t flags,
+ bool notify_reset,
+ unsigned *error,
void *sharedContextPrivate);
void *sharedContextPrivate);
-
#endif /* __RADEON_CONTEXT_H__ */
#endif /* __RADEON_CONTEXT_H__ */