Merge commit 'fa5103a02bd509e4a102afdad2ab26cb22210367'
This commit is contained in:
commit
235fa50304
|
@ -2303,6 +2303,9 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
|
||||||
return(Success);
|
return(Success);
|
||||||
|
|
||||||
ActuallyDoSomething:
|
ActuallyDoSomething:
|
||||||
|
if (pWin->drawable.pScreen->ConfigNotify)
|
||||||
|
(*pWin->drawable.pScreen->ConfigNotify)(pWin, x, y, w, h, bw, pSib);
|
||||||
|
|
||||||
if (SubStrSend(pWin, pParent))
|
if (SubStrSend(pWin, pParent))
|
||||||
{
|
{
|
||||||
memset(&event, 0, sizeof(xEvent));
|
memset(&event, 0, sizeof(xEvent));
|
||||||
|
|
|
@ -202,27 +202,25 @@ find_attachment(DRI2DrawablePtr pPriv, unsigned attachment)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static DRI2BufferPtr
|
static Bool
|
||||||
allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds,
|
allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds,
|
||||||
DRI2DrawablePtr pPriv,
|
DRI2DrawablePtr pPriv,
|
||||||
unsigned int attachment, unsigned int format,
|
unsigned int attachment, unsigned int format,
|
||||||
int dimensions_match)
|
int dimensions_match, DRI2BufferPtr *buffer)
|
||||||
{
|
{
|
||||||
DRI2BufferPtr buffer;
|
int old_buf = find_attachment(pPriv, attachment);
|
||||||
int old_buf;
|
|
||||||
|
|
||||||
old_buf = find_attachment(pPriv, attachment);
|
|
||||||
|
|
||||||
if ((old_buf < 0)
|
if ((old_buf < 0)
|
||||||
|| !dimensions_match
|
|| !dimensions_match
|
||||||
|| (pPriv->buffers[old_buf]->format != format)) {
|
|| (pPriv->buffers[old_buf]->format != format)) {
|
||||||
buffer = (*ds->CreateBuffer)(pDraw, attachment, format);
|
*buffer = (*ds->CreateBuffer)(pDraw, attachment, format);
|
||||||
} else {
|
return TRUE;
|
||||||
buffer = pPriv->buffers[old_buf];
|
|
||||||
pPriv->buffers[old_buf] = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return buffer;
|
} else {
|
||||||
|
*buffer = pPriv->buffers[old_buf];
|
||||||
|
pPriv->buffers[old_buf] = NULL;
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static DRI2BufferPtr *
|
static DRI2BufferPtr *
|
||||||
|
@ -238,6 +236,7 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
|
||||||
int have_fake_front = 0;
|
int have_fake_front = 0;
|
||||||
int front_format = 0;
|
int front_format = 0;
|
||||||
int dimensions_match;
|
int dimensions_match;
|
||||||
|
int buffers_changed = 0;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (!pPriv) {
|
if (!pPriv) {
|
||||||
|
@ -256,8 +255,10 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
|
||||||
const unsigned attachment = *(attachments++);
|
const unsigned attachment = *(attachments++);
|
||||||
const unsigned format = (has_format) ? *(attachments++) : 0;
|
const unsigned format = (has_format) ? *(attachments++) : 0;
|
||||||
|
|
||||||
buffers[i] = allocate_or_reuse_buffer(pDraw, ds, pPriv, attachment,
|
if (allocate_or_reuse_buffer(pDraw, ds, pPriv, attachment,
|
||||||
format, dimensions_match);
|
format, dimensions_match,
|
||||||
|
&buffers[i]))
|
||||||
|
buffers_changed = 1;
|
||||||
|
|
||||||
/* If the drawable is a window and the front-buffer is requested,
|
/* If the drawable is a window and the front-buffer is requested,
|
||||||
* silently add the fake front-buffer to the list of requested
|
* silently add the fake front-buffer to the list of requested
|
||||||
|
@ -287,15 +288,18 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (need_real_front > 0) {
|
if (need_real_front > 0) {
|
||||||
buffers[i++] = allocate_or_reuse_buffer(pDraw, ds, pPriv,
|
if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFrontLeft,
|
||||||
DRI2BufferFrontLeft,
|
front_format, dimensions_match,
|
||||||
front_format, dimensions_match);
|
&buffers[i++]))
|
||||||
|
buffers_changed = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (need_fake_front > 0) {
|
if (need_fake_front > 0) {
|
||||||
buffers[i++] = allocate_or_reuse_buffer(pDraw, ds, pPriv,
|
if (allocate_or_reuse_buffer(pDraw, ds, pPriv, DRI2BufferFakeFrontLeft,
|
||||||
DRI2BufferFakeFrontLeft,
|
front_format, dimensions_match,
|
||||||
front_format, dimensions_match);
|
&buffers[i++]))
|
||||||
|
buffers_changed = 1;
|
||||||
|
|
||||||
have_fake_front = 1;
|
have_fake_front = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -324,7 +328,7 @@ do_get_buffers(DrawablePtr pDraw, int *width, int *height,
|
||||||
* contents of the real front-buffer. This ensures correct operation of
|
* contents of the real front-buffer. This ensures correct operation of
|
||||||
* applications that call glXWaitX before calling glDrawBuffer.
|
* applications that call glXWaitX before calling glDrawBuffer.
|
||||||
*/
|
*/
|
||||||
if (have_fake_front) {
|
if (have_fake_front && buffers_changed) {
|
||||||
BoxRec box;
|
BoxRec box;
|
||||||
RegionRec region;
|
RegionRec region;
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,7 @@ sdk_HEADERS = \
|
||||||
globals.h \
|
globals.h \
|
||||||
input.h \
|
input.h \
|
||||||
inputstr.h \
|
inputstr.h \
|
||||||
|
list.h \
|
||||||
misc.h \
|
misc.h \
|
||||||
miscstruct.h \
|
miscstruct.h \
|
||||||
opaque.h \
|
opaque.h \
|
||||||
|
|
97
include/list.h
Normal file
97
include/list.h
Normal file
|
@ -0,0 +1,97 @@
|
||||||
|
/*
|
||||||
|
* Copyright © 2010 Intel Corporation
|
||||||
|
* Copyright © 2010 Francisco Jerez <currojerez@riseup.net>
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
|
* to deal in the Software without restriction, including without limitation
|
||||||
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
* and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
* Software is furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice (including the next
|
||||||
|
* paragraph) shall be included in all copies or substantial portions of the
|
||||||
|
* Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
|
* IN THE SOFTWARE.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _LIST_H_
|
||||||
|
#define _LIST_H_
|
||||||
|
|
||||||
|
/* classic doubly-link circular list */
|
||||||
|
struct list {
|
||||||
|
struct list *next, *prev;
|
||||||
|
};
|
||||||
|
|
||||||
|
static void
|
||||||
|
list_init(struct list *list)
|
||||||
|
{
|
||||||
|
list->next = list->prev = list;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
__list_add(struct list *entry,
|
||||||
|
struct list *prev,
|
||||||
|
struct list *next)
|
||||||
|
{
|
||||||
|
next->prev = entry;
|
||||||
|
entry->next = next;
|
||||||
|
entry->prev = prev;
|
||||||
|
prev->next = entry;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
list_add(struct list *entry, struct list *head)
|
||||||
|
{
|
||||||
|
__list_add(entry, head, head->next);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
__list_del(struct list *prev, struct list *next)
|
||||||
|
{
|
||||||
|
next->prev = prev;
|
||||||
|
prev->next = next;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void
|
||||||
|
list_del(struct list *entry)
|
||||||
|
{
|
||||||
|
__list_del(entry->prev, entry->next);
|
||||||
|
list_init(entry);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline Bool
|
||||||
|
list_is_empty(struct list *head)
|
||||||
|
{
|
||||||
|
return head->next == head;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef container_of
|
||||||
|
#define container_of(ptr, type, member) \
|
||||||
|
(type *)((char *)(ptr) - (char *) &((type *)0)->member)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define list_entry(ptr, type, member) \
|
||||||
|
container_of(ptr, type, member)
|
||||||
|
|
||||||
|
#define list_first_entry(ptr, type, member) \
|
||||||
|
list_entry((ptr)->next, type, member)
|
||||||
|
|
||||||
|
#define __container_of(ptr, sample, member) \
|
||||||
|
(void *)((char *)(ptr) \
|
||||||
|
- ((char *)&(sample)->member - (char *)(sample)))
|
||||||
|
|
||||||
|
#define list_for_each_entry(pos, head, member) \
|
||||||
|
for (pos = __container_of((head)->next, pos, member); \
|
||||||
|
&pos->member != (head); \
|
||||||
|
pos = __container_of(pos->member.next, pos, member))
|
||||||
|
|
||||||
|
#endif
|
|
@ -399,6 +399,15 @@ typedef void (* PostChangeSaveUnderProcPtr)(
|
||||||
WindowPtr /*pLayerWin*/,
|
WindowPtr /*pLayerWin*/,
|
||||||
WindowPtr /*firstChild*/);
|
WindowPtr /*firstChild*/);
|
||||||
|
|
||||||
|
typedef void (* ConfigNotifyProcPtr)(
|
||||||
|
WindowPtr /*pWin*/,
|
||||||
|
int /*x*/,
|
||||||
|
int /*y*/,
|
||||||
|
int /*w*/,
|
||||||
|
int /*h*/,
|
||||||
|
int /*bw*/,
|
||||||
|
WindowPtr /*pSib*/);
|
||||||
|
|
||||||
typedef void (* MoveWindowProcPtr)(
|
typedef void (* MoveWindowProcPtr)(
|
||||||
WindowPtr /*pWin*/,
|
WindowPtr /*pWin*/,
|
||||||
int /*x*/,
|
int /*x*/,
|
||||||
|
@ -581,6 +590,7 @@ typedef struct _Screen {
|
||||||
MarkOverlappedWindowsProcPtr MarkOverlappedWindows;
|
MarkOverlappedWindowsProcPtr MarkOverlappedWindows;
|
||||||
ChangeSaveUnderProcPtr ChangeSaveUnder;
|
ChangeSaveUnderProcPtr ChangeSaveUnder;
|
||||||
PostChangeSaveUnderProcPtr PostChangeSaveUnder;
|
PostChangeSaveUnderProcPtr PostChangeSaveUnder;
|
||||||
|
ConfigNotifyProcPtr ConfigNotify;
|
||||||
MoveWindowProcPtr MoveWindow;
|
MoveWindowProcPtr MoveWindow;
|
||||||
ResizeWindowProcPtr ResizeWindow;
|
ResizeWindowProcPtr ResizeWindow;
|
||||||
GetLayerWindowProcPtr GetLayerWindow;
|
GetLayerWindowProcPtr GetLayerWindow;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user