Bug #6191: Sync Render gradient fixes from head. (Lars Knoll)

This commit is contained in:
Adam Jackson 2006-03-16 20:37:03 +00:00
parent 4a6be6ed7c
commit fece342703
3 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2006-03-16 Adam Jackson <ajax@freedesktop.org>
* render/picture.c:
* miext/cw/cw.h:
Bug #6191: Sync Render gradient fixes from head. (Lars Knoll)
2006-03-14 Eric Anholt <anholt@FreeBSD.org>
* GL/mesa/array_cache/Makefile.am:

View file

@ -60,7 +60,8 @@ typedef struct {
unsigned long stateChanges;
} cwPictureRec, *cwPicturePtr;
#define getCwPicture(pPicture) ((cwPicturePtr)(pPicture)->devPrivates[cwPictureIndex].ptr)
#define getCwPicture(pPicture) \
(pPicture->pDrawable ? ((cwPicturePtr)(pPicture)->devPrivates[cwPictureIndex].ptr) : 0)
#define setCwPicture(pPicture,p) ((pPicture)->devPrivates[cwPictureIndex].ptr = (pointer) (p))
extern int cwPictureIndex;

View file

@ -974,8 +974,10 @@ static PicturePtr createSourcePicture(void)
PicturePtr pPicture;
pPicture = (PicturePtr) xalloc(sizeof(PictureRec));
pPicture->pDrawable = 0;
pPicture->format = PICT_a8r8g8b8;
pPicture->pFormat = 0;
pPicture->pNext = 0;
pPicture->devPrivates = 0;
SetPictureToDefaults(pPicture);
return pPicture;