diff options
author | George Sapountzis <gsap7@yahoo.gr> | 2008-05-11 14:43:22 +0300 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2008-05-20 16:03:44 -0400 |
commit | c95e66120be049ee51ff84868b1da3379b312fab (patch) | |
tree | 9ec66f9fe319691b4cc904a59c35f7b36693d82a /src/mesa/drivers/dri/common/dri_util.h | |
parent | b539b6132141b0f583076355ad158852667b79cd (diff) |
Make utils.h self-contained.
Move stuff with drm dependencies to dri_util.h, and move a couple of
types without drm dependencies to utils.h.
Diffstat (limited to 'src/mesa/drivers/dri/common/dri_util.h')
-rw-r--r-- | src/mesa/drivers/dri/common/dri_util.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h index 06e1d20a3c..8e1cdfc893 100644 --- a/src/mesa/drivers/dri/common/dri_util.h +++ b/src/mesa/drivers/dri/common/dri_util.h @@ -61,7 +61,6 @@ #define GLX_BAD_CONTEXT 5 typedef struct __DRIswapInfoRec __DRIswapInfo; -typedef struct __DRIutilversionRec2 __DRIutilversion2; /* Typedefs to avoid rewriting the world. */ typedef struct __DRIscreenRec __DRIscreenPrivate; @@ -536,22 +535,6 @@ struct __DRIscreenRec { drmLock *lock; }; -struct __DRIconfigRec { - __GLcontextModes modes; -}; - -/** - * Used to store a version which includes a major range instead of a single - * major version number. - */ -struct __DRIutilversionRec2 { - int major_min; /** min allowed Major version number. */ - int major_max; /** max allowed Major version number. */ - int minor; /**< Minor version number. */ - int patch; /**< Patch-level. */ -}; - - extern void __driUtilMessage(const char *f, ...); @@ -566,4 +549,7 @@ extern float driCalculateSwapUsage( __DRIdrawable *dPriv, int64_t last_swap_ust, int64_t current_ust ); +extern GLint +driIntersectArea( drm_clip_rect_t rect1, drm_clip_rect_t rect2 ); + #endif /* _DRI_UTIL_H_ */ |