projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glx: Fix build and warnings with -Dglx=dri -Dglx-direct=false
[mesa.git]
/
src
/
glx
/
dri_common.c
diff --git
a/src/glx/dri_common.c
b/src/glx/dri_common.c
index 2db29fd6abbfd4886133a0d5db028308d15e973c..a5fae27fce9dbcfc385b5cf096e48f8fea97eda8 100644
(file)
--- a/
src/glx/dri_common.c
+++ b/
src/glx/dri_common.c
@@
-166,6
+166,10
@@
static const struct
__ATTRIB(__DRI_ATTRIB_GREEN_MASK, greenMask),
__ATTRIB(__DRI_ATTRIB_BLUE_MASK, blueMask),
__ATTRIB(__DRI_ATTRIB_ALPHA_MASK, alphaMask),
__ATTRIB(__DRI_ATTRIB_GREEN_MASK, greenMask),
__ATTRIB(__DRI_ATTRIB_BLUE_MASK, blueMask),
__ATTRIB(__DRI_ATTRIB_ALPHA_MASK, alphaMask),
+ __ATTRIB(__DRI_ATTRIB_RED_SHIFT, redShift),
+ __ATTRIB(__DRI_ATTRIB_GREEN_SHIFT, greenShift),
+ __ATTRIB(__DRI_ATTRIB_BLUE_SHIFT, blueShift),
+ __ATTRIB(__DRI_ATTRIB_ALPHA_SHIFT, alphaShift),
#endif
__ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_WIDTH, maxPbufferWidth),
__ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_HEIGHT, maxPbufferHeight),
#endif
__ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_WIDTH, maxPbufferWidth),
__ATTRIB(__DRI_ATTRIB_MAX_PBUFFER_HEIGHT, maxPbufferHeight),
@@
-397,7
+401,7
@@
driReleaseDrawables(struct glx_context *gc)
if (pdraw->drawable == pdraw->xDrawable) {
pdraw->refcount --;
if (pdraw->refcount == 0) {
if (pdraw->drawable == pdraw->xDrawable) {
pdraw->refcount --;
if (pdraw->refcount == 0) {
-
(*pdraw->destroyDrawable)
(pdraw);
+
pdraw->destroyDrawable
(pdraw);
__glxHashDelete(priv->drawHash, gc->currentDrawable);
}
}
__glxHashDelete(priv->drawHash, gc->currentDrawable);
}
}
@@
-408,7
+412,7
@@
driReleaseDrawables(struct glx_context *gc)
if (pdraw->drawable == pdraw->xDrawable) {
pdraw->refcount --;
if (pdraw->refcount == 0) {
if (pdraw->drawable == pdraw->xDrawable) {
pdraw->refcount --;
if (pdraw->refcount == 0) {
-
(*pdraw->destroyDrawable)
(pdraw);
+
pdraw->destroyDrawable
(pdraw);
__glxHashDelete(priv->drawHash, gc->currentReadable);
}
}
__glxHashDelete(priv->drawHash, gc->currentReadable);
}
}