Merge remote branch 'jeremyhu/master'
This commit is contained in:
commit
a80b1f888f
|
@ -42,6 +42,8 @@
|
|||
#define GL_GLEXT_WUNDEF_SUPPORT
|
||||
|
||||
#include <OpenGL/OpenGL.h>
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glext.h>
|
||||
#include <OpenGL/CGLContext.h>
|
||||
|
||||
/* These next few GL_EXT pre-processing blocks are to explicitly define
|
||||
|
|
|
@ -35,9 +35,10 @@
|
|||
#include "dri.h"
|
||||
|
||||
#include <OpenGL/OpenGL.h>
|
||||
#include <OpenGL/gl.h>
|
||||
#include <OpenGL/glext.h>
|
||||
#include <OpenGL/CGLContext.h>
|
||||
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glxproto.h>
|
||||
#include <windowstr.h>
|
||||
#include <resource.h>
|
||||
|
|
|
@ -97,6 +97,7 @@ X_PFX (list_prepend) (x_list *lst, void *data)
|
|||
int i;
|
||||
|
||||
b = malloc (sizeof (x_list_block));
|
||||
assert(b != NULL);
|
||||
|
||||
for (i = 0; i < NODES_PER_BLOCK - 1; i++)
|
||||
b->l[i].next = &(b->l[i+1]);
|
||||
|
|
|
@ -552,6 +552,9 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
|
|||
DrawablePtr drawable = &pWin->drawable;
|
||||
|
||||
#ifdef ROOTLESS
|
||||
if(!drawable || drawable->type == UNDRAWABLE_WINDOW)
|
||||
return;
|
||||
|
||||
if(IsFramedWindow(pWin)) {
|
||||
RootlessStartDrawing(pWin);
|
||||
RootlessDamageRegion(pWin, prgn);
|
||||
|
|
|
@ -1553,10 +1553,6 @@ RootlessDisableRoot (ScreenPtr pScreen)
|
|||
return;
|
||||
|
||||
RootlessDestroyFrame (pRoot, winRec);
|
||||
/*
|
||||
* gstaplin: I fixed the usage of this DeleteProperty so that it would compile.
|
||||
* QUESTION: Where is this xa_native_window_id set?
|
||||
*/
|
||||
DeleteProperty (serverClient, pRoot, xa_native_window_id ());
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user