fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-24 21:10:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

dri: unify __DRIcontextRec, __DRIdrawableRec

Browse source
This commit is contained in:
George Sapountzis 2011-11-03 13:11:55 +02:00
parent 875a757ddd
commit e438a36d83
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/mesa/drivers/dri/common/dri_util.h
View file

@ -113,7 +113,7 @@ extern const struct __DriverAPIRec driDriverAPI;
*/
struct __DRIdrawableRec {
/**
* Driver's private drawable information.
* Driver's private drawable information.
*
* This structure is opaque.
*/
@ -125,9 +125,19 @@ struct __DRIdrawableRec {
*/
void *loaderPrivate;
/**
* Pointer to context to which this drawable is currently bound.
*/
__DRIcontext *driContextPriv;
/**
* Pointer to screen on which this drawable was created.
*/
__DRIscreen *driScreenPriv;
/**
* Reference count for number of context's currently bound to this
* drawable.
* drawable.
*
* Once it reaches zero, the drawable can be destroyed.
*
@ -146,16 +156,6 @@ struct __DRIdrawableRec {
int w, h;
/**
* Pointer to context to which this drawable is currently bound.
*/
__DRIcontext *driContextPriv;
/**
* Pointer to screen on which this drawable was created.
*/
__DRIscreen *driScreenPriv;
/**
* Drawable timestamp. Increased when the loader calls invalidate.
*/
@ -173,6 +173,11 @@ struct __DRIcontextRec {
*/
void *driverPrivate;
/**
* The loaders's private context data. This structure is opaque.
*/
void *loaderPrivate;
/**
* Pointer to drawable currently bound to this context for drawing.
*/
@ -188,11 +193,6 @@ struct __DRIcontextRec {
*/
__DRIscreen *driScreenPriv;
/**
* The loaders's private context data. This structure is opaque.
*/
void *loaderPrivate;
struct {
int draw_stamp;
int read_stamp;

3
src/mesa/drivers/dri/common/drisw_util.h
View file

@ -132,8 +132,7 @@ struct __DRIdrawableRec {
/* gallium */
unsigned int lastStamp;
int w;
int h;
int w, h;
};
#endif /* _DRISW_UTIL_H */