summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--va/va_backend.h2
-rw-r--r--va/x11/dri1_util.c18
-rw-r--r--va/x11/dri2_util.c20
-rw-r--r--va/x11/va_x11.c8
4 files changed, 24 insertions, 24 deletions
diff --git a/va/va_backend.h b/va/va_backend.h
index fb1231c..370c78d 100644
--- a/va/va_backend.h
+++ b/va/va_backend.h
@@ -382,7 +382,7 @@ struct VADriverContext
void *pDriverData;
struct VADriverVTable vtable;
- Display *x11_dpy;
+ void *native_dpy;
int x11_screen;
int version_major;
int version_minor;
diff --git a/va/x11/dri1_util.c b/va/x11/dri1_util.c
index 3e67e2a..d9afca6 100644
--- a/va/x11/dri1_util.c
+++ b/va/x11/dri1_util.c
@@ -62,12 +62,12 @@ dri1Close(VADriverContextP ctx)
struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
free_drawable_hashtable(ctx);
- VA_DRIDestroyContext(ctx->x11_dpy, ctx->x11_screen, dri_state->hwContextID);
+ VA_DRIDestroyContext((Display *)ctx->native_dpy, ctx->x11_screen, dri_state->hwContextID);
assert(dri_state->pSAREA != MAP_FAILED);
drmUnmap(dri_state->pSAREA, SAREA_MAX);
assert(dri_state->fd >= 0);
drmCloseOnce(dri_state->fd);
- VA_DRICloseConnection(ctx->x11_dpy, ctx->x11_screen);
+ VA_DRICloseConnection((Display *)ctx->native_dpy, ctx->x11_screen);
}
Bool
@@ -87,7 +87,7 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name)
dri_state->pSAREA = MAP_FAILED;
dri_state->driConnectedFlag = VA_NONE;
- if (!VA_DRIQueryDirectRenderingCapable(ctx->x11_dpy,
+ if (!VA_DRIQueryDirectRenderingCapable((Display *)ctx->native_dpy,
ctx->x11_screen,
&direct_capable))
goto err_out0;
@@ -95,12 +95,12 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name)
if (!direct_capable)
goto err_out0;
- if (!VA_DRIGetClientDriverName(ctx->x11_dpy, ctx->x11_screen,
+ if (!VA_DRIGetClientDriverName((Display *)ctx->native_dpy, ctx->x11_screen,
&driver_major, &driver_minor,
&driver_patch, driver_name))
goto err_out0;
- if (!VA_DRIOpenConnection(ctx->x11_dpy, ctx->x11_screen,
+ if (!VA_DRIOpenConnection((Display *)ctx->native_dpy, ctx->x11_screen,
&dri_state->hSAREA, &BusID))
goto err_out0;
@@ -115,14 +115,14 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name)
if (drmGetMagic(dri_state->fd, &magic))
goto err_out1;
- if (newlyopened && !VA_DRIAuthConnection(ctx->x11_dpy, ctx->x11_screen, magic))
+ if (newlyopened && !VA_DRIAuthConnection((Display *)ctx->native_dpy, ctx->x11_screen, magic))
goto err_out1;
if (drmMap(dri_state->fd, dri_state->hSAREA, SAREA_MAX, &dri_state->pSAREA))
goto err_out1;
- if (!VA_DRICreateContext(ctx->x11_dpy, ctx->x11_screen,
- DefaultVisual(ctx->x11_dpy, ctx->x11_screen),
+ if (!VA_DRICreateContext((Display *)ctx->native_dpy, ctx->x11_screen,
+ DefaultVisual((Display *)ctx->native_dpy, ctx->x11_screen),
&dri_state->hwContextID, &dri_state->hwContext))
goto err_out1;
@@ -142,7 +142,7 @@ err_out1:
if (dri_state->fd >= 0)
drmCloseOnce(dri_state->fd);
- VA_DRICloseConnection(ctx->x11_dpy, ctx->x11_screen);
+ VA_DRICloseConnection((Display *)ctx->native_dpy, ctx->x11_screen);
err_out0:
if (*driver_name)
diff --git a/va/x11/dri2_util.c b/va/x11/dri2_util.c
index ebe7a2c..092f6a3 100644
--- a/va/x11/dri2_util.c
+++ b/va/x11/dri2_util.c
@@ -48,7 +48,7 @@ dri2CreateDrawable(VADriverContextP ctx, XID x_drawable)
dri2_drawable->base.x_drawable = x_drawable;
dri2_drawable->base.x = 0;
dri2_drawable->base.y = 0;
- VA_DRI2CreateDrawable(ctx->x11_dpy, x_drawable);
+ VA_DRI2CreateDrawable((Display *)ctx->native_dpy, x_drawable);
return &dri2_drawable->base;
}
@@ -56,7 +56,7 @@ dri2CreateDrawable(VADriverContextP ctx, XID x_drawable)
static void
dri2DestroyDrawable(VADriverContextP ctx, struct dri_drawable *dri_drawable)
{
- VA_DRI2DestroyDrawable(ctx->x11_dpy, dri_drawable->x_drawable);
+ VA_DRI2DestroyDrawable((Display *)ctx->native_dpy, dri_drawable->x_drawable);
free(dri_drawable);
}
@@ -73,10 +73,10 @@ dri2SwapBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
xrect.width = dri2_drawable->width;
xrect.height = dri2_drawable->height;
- region = XFixesCreateRegion(ctx->x11_dpy, &xrect, 1);
- VA_DRI2CopyRegion(ctx->x11_dpy, dri_drawable->x_drawable, region,
+ region = XFixesCreateRegion((Display *)ctx->native_dpy, &xrect, 1);
+ VA_DRI2CopyRegion((Display *)ctx->native_dpy, dri_drawable->x_drawable, region,
DRI2BufferFrontLeft, DRI2BufferBackLeft);
- XFixesDestroyRegion(ctx->x11_dpy, region);
+ XFixesDestroyRegion((Display *)ctx->native_dpy, region);
}
}
@@ -92,7 +92,7 @@ dri2GetRenderingBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
i = 0;
attachments[i++] = __DRI_BUFFER_BACK_LEFT;
attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
- buffers = VA_DRI2GetBuffers(ctx->x11_dpy, dri_drawable->x_drawable,
+ buffers = VA_DRI2GetBuffers((Display *)ctx->native_dpy, dri_drawable->x_drawable,
&dri2_drawable->width, &dri2_drawable->height,
attachments, i, &count);
assert(buffers);
@@ -149,14 +149,14 @@ isDRI2Connected(VADriverContextP ctx, char **driver_name)
*driver_name = NULL;
dri_state->fd = -1;
dri_state->driConnectedFlag = VA_NONE;
- if (!VA_DRI2QueryExtension(ctx->x11_dpy, &event_base, &error_base))
+ if (!VA_DRI2QueryExtension((Display *)ctx->native_dpy, &event_base, &error_base))
goto err_out;
- if (!VA_DRI2QueryVersion(ctx->x11_dpy, &major, &minor))
+ if (!VA_DRI2QueryVersion((Display *)ctx->native_dpy, &major, &minor))
goto err_out;
- if (!VA_DRI2Connect(ctx->x11_dpy, RootWindow(ctx->x11_dpy, ctx->x11_screen),
+ if (!VA_DRI2Connect((Display *)ctx->native_dpy, RootWindow((Display *)ctx->native_dpy, ctx->x11_screen),
driver_name, &device_name))
goto err_out;
@@ -169,7 +169,7 @@ isDRI2Connected(VADriverContextP ctx, char **driver_name)
if (drmGetMagic(dri_state->fd, &magic))
goto err_out;
- if (!VA_DRI2Authenticate(ctx->x11_dpy, RootWindow(ctx->x11_dpy, ctx->x11_screen),
+ if (!VA_DRI2Authenticate((Display *)ctx->native_dpy, RootWindow((Display *)ctx->native_dpy, ctx->x11_screen),
magic))
goto err_out;
diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c
index 29e81c8..9c29140 100644
--- a/va/x11/va_x11.c
+++ b/va/x11/va_x11.c
@@ -116,12 +116,12 @@ static VAStatus va_NVCTRL_GetDriverName (
int direct_capable, driver_major, driver_minor, driver_patch;
Bool result;
- result = VA_NVCTRLQueryDirectRenderingCapable(ctx->x11_dpy, ctx->x11_screen,
+ result = VA_NVCTRLQueryDirectRenderingCapable((Display *)ctx->native_dpy, ctx->x11_screen,
&direct_capable);
if (!result || !direct_capable)
return VA_STATUS_ERROR_UNKNOWN;
- result = VA_NVCTRLGetClientDriverName(ctx->x11_dpy, ctx->x11_screen,
+ result = VA_NVCTRLGetClientDriverName((Display *)ctx->native_dpy, ctx->x11_screen,
&driver_major, &driver_minor,
&driver_patch, driver_name);
if (!result)
@@ -172,7 +172,7 @@ VADisplay vaGetDisplay (
while (pDisplayContext)
{
if (pDisplayContext->pDriverContext &&
- pDisplayContext->pDriverContext->x11_dpy == native_dpy)
+ pDisplayContext->pDriverContext->native_dpy == (void *)native_dpy)
{
dpy = (VADisplay)pDisplayContext;
break;
@@ -192,7 +192,7 @@ VADisplay vaGetDisplay (
{
pDisplayContext->vadpy_magic = VA_DISPLAY_MAGIC;
- pDriverContext->x11_dpy = native_dpy;
+ pDriverContext->native_dpy = (void *)native_dpy;
pDisplayContext->pNext = pDisplayContexts;
pDisplayContext->pDriverContext = pDriverContext;
pDisplayContext->vaIsValid = va_DisplayContextIsValid;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 21:22:52 +0000