summaryrefslogtreecommitdiff
path: root/hw/xfree86/dri2/dri2ext.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2009-07-01 14:01:57 -0700
committerKeith Packard <keithp@keithp.com>2009-07-06 12:01:12 -0700
commit2e2c5b216cc1c7a9bc26bd2c68226aaed5fc52ca (patch)
tree6c06d7ccca1538a9c74206104c9884c87f4f738e /hw/xfree86/dri2/dri2ext.c
parent7c7f0c2c6a04f7044d5ce69e97a615735e5831f1 (diff)
dri2: Preserve compatibility with 1.6 DRI2 API/ABI
The old DRI2 buffer allocation API wasn't great, but there's no reason to make the server stop working with those drivers. This patch has the X server adapting to the API provided by the driver, using the new API where available and falling back to the old API as necessary. A warning will be placed in the log file when the old API is in use. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw/xfree86/dri2/dri2ext.c')
-rw-r--r--hw/xfree86/dri2/dri2ext.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 029dce84e..ea160ac60 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -195,7 +195,7 @@ ProcDRI2DestroyDrawable(ClientPtr client)
static void
send_buffers_reply(ClientPtr client, DrawablePtr pDrawable,
- DRI2BufferPtr *buffers, int count, int width, int height)
+ DRI2Buffer2Ptr *buffers, int count, int width, int height)
{
xDRI2GetBuffersReply rep;
int skip = 0;
@@ -245,7 +245,7 @@ ProcDRI2GetBuffers(ClientPtr client)
{
REQUEST(xDRI2GetBuffersReq);
DrawablePtr pDrawable;
- DRI2BufferPtr *buffers;
+ DRI2Buffer2Ptr *buffers;
int status, width, height, count;
unsigned int *attachments;
@@ -268,7 +268,7 @@ ProcDRI2GetBuffersWithFormat(ClientPtr client)
{
REQUEST(xDRI2GetBuffersReq);
DrawablePtr pDrawable;
- DRI2BufferPtr *buffers;
+ DRI2Buffer2Ptr *buffers;
int status, width, height, count;
unsigned int *attachments;