fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-01 21:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

DRI2: Do not send the real front buffer of a window to the client

Browse source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit f1a995d149)
This commit is contained in:
Ian Romanick 2009-04-09 14:31:01 -07:00
parent 32d250a881
commit 73b786f7e7
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
glx/glxdri2.c
View file

@ -361,6 +361,7 @@ dri2GetBuffers(__DRIdrawable *driDrawable,
__GLXDRIdrawable *private = loaderPrivate;
DRI2BufferPtr buffers;
int i;
int skip = 0;
buffers = DRI2GetBuffers(private->base.pDraw,
width, height, attachments, count, out_count);
@ -375,6 +376,14 @@ dri2GetBuffers(__DRIdrawable *driDrawable,
/* This assumes the DRI2 buffer attachment tokens matches the
* __DRIbuffer tokens. */
for (i = 0; i < *out_count; i++) {
/* Do not send the real front buffer of a window to the client.
*/
if ((private->base.pDraw->type == DRAWABLE_WINDOW)
&& (buffers[i].attachment == DRI2BufferFrontLeft)) {
skip++;
continue;
}
private->buffers[i].attachment = buffers[i].attachment;
private->buffers[i].name = buffers[i].name;
private->buffers[i].pitch = buffers[i].pitch;
@ -382,6 +391,7 @@ dri2GetBuffers(__DRIdrawable *driDrawable,
private->buffers[i].flags = buffers[i].flags;
}
*out_count -= skip;
return private->buffers;
}

24
hw/xfree86/dri2/dri2ext.c
View file

@ -203,6 +203,7 @@ ProcDRI2GetBuffers(ClientPtr client)
int i, status, width, height, count;
unsigned int *attachments;
xDRI2Buffer buffer;
int skip;
REQUEST_FIXED_SIZE(xDRI2GetBuffersReq, stuff->count * 4);
if (!validDrawable(client, stuff->drawable, &pDrawable, &status))
@ -212,15 +213,34 @@ ProcDRI2GetBuffers(ClientPtr client)
buffers = DRI2GetBuffers(pDrawable, &width, &height,
attachments, stuff->count, &count);
skip = 0;
if (pDrawable->type == DRAWABLE_WINDOW) {
for (i = 0; i < count; i++) {
/* Do not send the real front buffer of a window to the client.
*/
if (buffers[i].attachment == DRI2BufferFrontLeft) {
skip++;
continue;
}
}
}
rep.type = X_Reply;
rep.length = count * sizeof(xDRI2Buffer) / 4;
rep.length = (count - skip) * sizeof(xDRI2Buffer) / 4;
rep.sequenceNumber = client->sequence;
rep.width = width;
rep.height = height;
rep.count = count;
rep.count = count - skip;
WriteToClient(client, sizeof(xDRI2GetBuffersReply), &rep);
for (i = 0; i < count; i++) {
/* Do not send the real front buffer of a window to the client.
*/
if ((pDrawable->type == DRAWABLE_WINDOW)
&& (buffers[i].attachment == DRI2BufferFrontLeft)) {
continue;
}
buffer.attachment = buffers[i].attachment;
buffer.name = buffers[i].name;
buffer.pitch = buffers[i].pitch;