xserver: Branch 'glucose-2' - 2 commits
Alan Hourihane
alanh at kemper.freedesktop.org
Wed Oct 17 03:24:07 PDT 2007
glucose/glucose.c | 28 ++++++++++++----------------
glucose/glucose.h | 6 +++---
xgl/xgl.h | 5 +++++
xgl/xglcompose.c | 4 ----
xgl/xglcopy.c | 5 -----
xgl/xglget.c | 5 -----
xgl/xglsolid.c | 4 ----
xgl/xglsync.c | 9 +++++++++
xgl/xgltile.c | 4 ----
9 files changed, 29 insertions(+), 41 deletions(-)
New commits:
commit 8cd220049834110da87c99a4fed35b7e6cbc48c2
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date: Wed Oct 17 11:23:59 2007 +0100
ensure finish is called for front buffer rendering.
diff --git a/xgl/xgl.h b/xgl/xgl.h
index 62bbee0..d79d0c0 100644
--- a/xgl/xgl.h
+++ b/xgl/xgl.h
@@ -28,6 +28,11 @@
#include <xgl-config.h>
+#include "glxserver.h"
+#include "glapi.h"
+#include "glthread.h"
+#include "dispatch.h"
+
#include <X11/X.h>
#define NEED_EVENTS
#include <X11/Xproto.h>
diff --git a/xgl/xglcompose.c b/xgl/xglcompose.c
index f6725ac..5f27f54 100644
--- a/xgl/xglcompose.c
+++ b/xgl/xglcompose.c
@@ -23,10 +23,6 @@
* Author: David Reveman <davidr at novell.com>
*/
-#include "glxserver.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
#include "xgl.h"
#ifdef RENDER
diff --git a/xgl/xglcopy.c b/xgl/xglcopy.c
index b0cf82f..c5c479c 100644
--- a/xgl/xglcopy.c
+++ b/xgl/xglcopy.c
@@ -22,11 +22,6 @@
*
* Author: David Reveman <davidr at novell.com>
*/
-#include "glxserver.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
-
#include "xgl.h"
#include "fb.h"
diff --git a/xgl/xglget.c b/xgl/xglget.c
index 71e32b1..5804012 100644
--- a/xgl/xglget.c
+++ b/xgl/xglget.c
@@ -22,11 +22,6 @@
*
* Author: David Reveman <davidr at novell.com>
*/
-#include "glxserver.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
-
#include "xgl.h"
diff --git a/xgl/xglsolid.c b/xgl/xglsolid.c
index a3dc281..3a820ad 100644
--- a/xgl/xglsolid.c
+++ b/xgl/xglsolid.c
@@ -22,10 +22,6 @@
*
* Author: David Reveman <davidr at novell.com>
*/
-#include "glxserver.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
#include "xgl.h"
#include "gcstruct.h"
diff --git a/xgl/xglsync.c b/xgl/xglsync.c
index 2daef6e..ad7f66d 100644
--- a/xgl/xglsync.c
+++ b/xgl/xglsync.c
@@ -475,6 +475,15 @@ xglAddCurrentBitDamage (DrawablePtr pDrawable)
{
XGL_DRAWABLE_PIXMAP_PRIV (pDrawable);
+ {
+ /* This is a little severe as it also impacts xgl - tune me */
+ XGL_SCREEN_PRIV (pDrawable->pScreen);
+ __glXleaveServer(FALSE);
+ glitz_surface_flush (pScreenPriv->surface);
+ glitz_drawable_finish (pScreenPriv->drawable);
+ __glXenterServer(FALSE);
+ }
+
if (REGION_NOTEMPTY (pDrawable->pScreen, &pPixmapPriv->bitRegion))
{
BoxPtr pBitExt;
diff --git a/xgl/xgltile.c b/xgl/xgltile.c
index 200b381..dc7c301 100644
--- a/xgl/xgltile.c
+++ b/xgl/xgltile.c
@@ -22,10 +22,6 @@
*
* Author: David Reveman <davidr at novell.com>
*/
-#include "glxserver.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
#include "xgl.h"
commit e4fdef9ec28e3ab4da16b2137acc93ba07500747
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date: Wed Oct 17 10:53:13 2007 +0100
Glucose -> GLucose
diff --git a/glucose/glucose.c b/glucose/glucose.c
index 9e99333..f805275 100644
--- a/glucose/glucose.c
+++ b/glucose/glucose.c
@@ -91,11 +91,11 @@ glucoseCreateWindow(WindowPtr pWin)
ScreenPtr pScreen = pWin->drawable.pScreen;
CreateWindowProcPtr CreateWindow =
(CreateWindowProcPtr)(pScreen->devPrivates[glucoseCreateWindowIndex].ptr);
- GlucoseScreenPrivPtr pScreenPriv = GlucoseGetScreenPriv(pScreen);
+ GLucoseScreenPrivPtr pScreenPriv = GLucoseGetScreenPriv(pScreen);
int err;
xf86DrvMsg(pScreen->myNum, X_INFO,
- "Glucose initializing screen %d\n",pScreen->myNum);
+ "GLucose initializing screen %d\n",pScreen->myNum);
if ( pScreen->CreateWindow != glucoseCreateWindow ) {
/* Can't find hook we are hung on */
@@ -148,7 +148,7 @@ glucoseCreateWindow(WindowPtr pWin)
if (!pScreenPriv->rootDrawable) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
- "Glucose - creating root drawable failed\n");
+ "GLucose - creating root drawable failed\n");
return FALSE;
}
@@ -156,7 +156,7 @@ glucoseCreateWindow(WindowPtr pWin)
if (!pScreenPriv->rootContext) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
- "Glucose - creating root context failed\n");
+ "GLucose - creating root context failed\n");
pScreenPriv->rootDrawable->destroy(pScreenPriv->rootDrawable);
pScreenPriv->rootDrawable = NULL;
return FALSE;
@@ -170,7 +170,7 @@ glucoseCreateWindow(WindowPtr pWin)
if (!err) {
__glXenterServer(FALSE);
xf86DrvMsg(pScreen->myNum, X_WARNING,
- "Glucose makeCurrent failed, err is %d\n",err);
+ "GLucose makeCurrent failed, err is %d\n",err);
pScreenPriv->rootContext->destroy(pScreenPriv->rootContext);
pScreenPriv->rootContext = NULL;
pScreenPriv->rootDrawable->destroy(pScreenPriv->rootDrawable);
@@ -188,7 +188,7 @@ glucoseCreateWindow(WindowPtr pWin)
if (!drawable) {
__glXenterServer(FALSE);
xf86DrvMsg(pScreen->myNum, X_ERROR,
- "Glucose could not create glitz drawable, not initializing.\n");
+ "GLucose could not create glitz drawable, not initializing.\n");
pScreenPriv->rootContext->destroy(pScreenPriv->rootContext);
pScreenPriv->rootContext = NULL;
@@ -202,12 +202,12 @@ glucoseCreateWindow(WindowPtr pWin)
glitz_drawable_get_features (xglScreenInfo.drawable);
xf86DrvMsg(pScreen->myNum, X_INFO,
- "Glucose reports GLitz features as 0x%lx\n",xglScreenPriv->features);
+ "GLucose reports GLitz features as 0x%lx\n",xglScreenPriv->features);
if (!glucoseFinishScreenInit(pScreen)) {
__glXenterServer(FALSE);
xf86DrvMsg(pScreen->myNum, X_ERROR,
- "Glucose could not initialize.\n");
+ "GLucose could not initialize.\n");
pScreenPriv->rootContext->destroy(pScreenPriv->rootContext);
pScreenPriv->rootContext = NULL;
pScreenPriv->rootDrawable->destroy(pScreenPriv->rootDrawable);
@@ -256,7 +256,7 @@ glucoseCreateWindow(WindowPtr pWin)
static Bool
glucoseAllocatePrivates(ScreenPtr pScreen)
{
- GlucoseScreenPrivPtr pScreenPriv;
+ GLucoseScreenPrivPtr pScreenPriv;
if (glucoseGeneration != serverGeneration) {
glucoseScreenPrivateIndex = AllocateScreenPrivateIndex();
@@ -269,9 +269,9 @@ glucoseAllocatePrivates(ScreenPtr pScreen)
glucoseGeneration = serverGeneration;
}
- pScreenPriv = xalloc(sizeof(GlucoseScreenPrivRec));
+ pScreenPriv = xalloc(sizeof(GLucoseScreenPrivRec));
if (!pScreenPriv) {
- LogMessage(X_WARNING, "Glucose(%d): Failed to allocate screen private\n",
+ LogMessage(X_WARNING, "GLucose(%d): Failed to allocate screen private\n",
pScreen->myNum);
return FALSE;
}
@@ -727,15 +727,11 @@ glucoseCloseScreen (int index,
XGL_SCREEN_PRIV (pScreen);
XGL_PIXMAP_PRIV (pScreenPriv->pScreenPixmap);
XGL_SCREEN_UNWRAP (CloseScreen);
- GlucoseScreenPrivPtr pPriv = GlucoseGetScreenPriv(pScreen);
+ GLucoseScreenPrivPtr pPriv = GLucoseGetScreenPriv(pScreen);
__pGlxClient = serverClient;
xglFiniPixmap (pScreenPriv->pScreenPixmap);
-#if 0
- if (pPixmapPriv->pDamage)
- DamageDestroy (pPixmapPriv->pDamage);
-#endif
#ifdef RENDER
int i;
diff --git a/glucose/glucose.h b/glucose/glucose.h
index dcd35dd..2ba6072 100644
--- a/glucose/glucose.h
+++ b/glucose/glucose.h
@@ -49,10 +49,10 @@ typedef struct {
DestroyPixmapProcPtr *DestroyPixmap;
__GLXscreen *screen;
destroyGLXscreenProcPtr destroyGLXscreen;
-} GlucoseScreenPrivRec, *GlucoseScreenPrivPtr;
+} GLucoseScreenPrivRec, *GLucoseScreenPrivPtr;
extern int glucoseScreenPrivateIndex;
-#define GlucoseGetScreenPriv(s) ((GlucoseScreenPrivPtr)(s)->devPrivates[glucoseScreenPrivateIndex].ptr)
-#define GlucoseScreenPriv(s) GlucoseScreenPrivPtr pGlucoseScr = GlucoseGetScreenPriv(s)
+#define GLucoseGetScreenPriv(s) ((GLucoseScreenPrivPtr)(s)->devPrivates[glucoseScreenPrivateIndex].ptr)
+#define GLucoseScreenPriv(s) GLucoseScreenPrivPtr pGLucoseScr = GLucoseGetScreenPriv(s)
#endif /* GLUCOSE_H */
More information about the xorg-commit
mailing list