projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'llvm-cliptest-viewport'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
savage
/
savagecontext.h
diff --git
a/src/mesa/drivers/dri/savage/savagecontext.h
b/src/mesa/drivers/dri/savage/savagecontext.h
index fd6399d6a6f59f2d6a8610e42c73f5a05212722c..75bec62fa84204a8db3310d1888b7df72a33e4e0 100644
(file)
--- a/
src/mesa/drivers/dri/savage/savagecontext.h
+++ b/
src/mesa/drivers/dri/savage/savagecontext.h
@@
-31,7
+31,6
@@
typedef struct savage_context_t savageContext;
typedef struct savage_context_t *savageContextPtr;
typedef struct savage_texture_object_t *savageTextureObjectPtr;
typedef struct savage_context_t *savageContextPtr;
typedef struct savage_texture_object_t *savageTextureObjectPtr;
-#include <X11/Xlibint.h>
#include "dri_util.h"
#include "main/mtypes.h"
#include "xf86drm.h"
#include "dri_util.h"
#include "main/mtypes.h"
#include "xf86drm.h"
@@
-149,7
+148,7
@@
struct savage_elt_t {
struct savage_context_t {
GLint refcount;
struct savage_context_t {
GLint refcount;
-
GL
context *glCtx;
+
struct gl_
context *glCtx;
int lastTexHeap;
driTexHeap *textureHeaps[SAVAGE_NR_TEX_HEAPS];
int lastTexHeap;
driTexHeap *textureHeaps[SAVAGE_NR_TEX_HEAPS];
@@
-227,7
+226,7
@@
struct savage_context_t {
/* DRI stuff */
GLuint bufferSize;
/* DRI stuff */
GLuint bufferSize;
-
GL
framebuffer *glBuffer;
+
struct gl_
framebuffer *glBuffer;
/* Two flags to keep track of fallbacks. */
GLuint Fallback;
/* Two flags to keep track of fallbacks. */
GLuint Fallback;
@@
-272,10
+271,10
@@
struct savage_context_t {
drm_hw_lock_t *driHwLock;
GLuint driFd;
drm_hw_lock_t *driHwLock;
GLuint driFd;
- __DRIdrawable
Private
*driDrawable;
- __DRIdrawable
Private
*driReadable;
+ __DRIdrawable *driDrawable;
+ __DRIdrawable *driReadable;
- __DRIscreen
Private
*driScreen;
+ __DRIscreen *driScreen;
savageScreenPrivate *savageScreen;
drm_savage_sarea_t *sarea;
savageScreenPrivate *savageScreen;
drm_savage_sarea_t *sarea;