Commit 0938f1a2 authored by Gwenole Beauchesne's avatar Gwenole Beauchesne Committed by Austin Yuan

VA/X11: drop useless casts.

parent b0fb5458
...@@ -62,12 +62,12 @@ dri1Close(VADriverContextP ctx) ...@@ -62,12 +62,12 @@ dri1Close(VADriverContextP ctx)
struct dri_state *dri_state = (struct dri_state *)ctx->dri_state; struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
free_drawable_hashtable(ctx); free_drawable_hashtable(ctx);
VA_DRIDestroyContext((Display *)ctx->native_dpy, ctx->x11_screen, dri_state->hwContextID); VA_DRIDestroyContext(ctx->native_dpy, ctx->x11_screen, dri_state->hwContextID);
assert(dri_state->pSAREA != MAP_FAILED); assert(dri_state->pSAREA != MAP_FAILED);
drmUnmap(dri_state->pSAREA, SAREA_MAX); drmUnmap(dri_state->pSAREA, SAREA_MAX);
assert(dri_state->fd >= 0); assert(dri_state->fd >= 0);
drmCloseOnce(dri_state->fd); drmCloseOnce(dri_state->fd);
VA_DRICloseConnection((Display *)ctx->native_dpy, ctx->x11_screen); VA_DRICloseConnection(ctx->native_dpy, ctx->x11_screen);
} }
Bool Bool
...@@ -87,7 +87,7 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name) ...@@ -87,7 +87,7 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name)
dri_state->pSAREA = MAP_FAILED; dri_state->pSAREA = MAP_FAILED;
dri_state->driConnectedFlag = VA_NONE; dri_state->driConnectedFlag = VA_NONE;
if (!VA_DRIQueryDirectRenderingCapable((Display *)ctx->native_dpy, if (!VA_DRIQueryDirectRenderingCapable(ctx->native_dpy,
ctx->x11_screen, ctx->x11_screen,
&direct_capable)) &direct_capable))
goto err_out0; goto err_out0;
...@@ -95,12 +95,12 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name) ...@@ -95,12 +95,12 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name)
if (!direct_capable) if (!direct_capable)
goto err_out0; goto err_out0;
if (!VA_DRIGetClientDriverName((Display *)ctx->native_dpy, ctx->x11_screen, if (!VA_DRIGetClientDriverName(ctx->native_dpy, ctx->x11_screen,
&driver_major, &driver_minor, &driver_major, &driver_minor,
&driver_patch, driver_name)) &driver_patch, driver_name))
goto err_out0; goto err_out0;
if (!VA_DRIOpenConnection((Display *)ctx->native_dpy, ctx->x11_screen, if (!VA_DRIOpenConnection(ctx->native_dpy, ctx->x11_screen,
&dri_state->hSAREA, &BusID)) &dri_state->hSAREA, &BusID))
goto err_out0; goto err_out0;
...@@ -115,14 +115,14 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name) ...@@ -115,14 +115,14 @@ isDRI1Connected(VADriverContextP ctx, char **driver_name)
if (drmGetMagic(dri_state->fd, &magic)) if (drmGetMagic(dri_state->fd, &magic))
goto err_out1; goto err_out1;
if (newlyopened && !VA_DRIAuthConnection((Display *)ctx->native_dpy, ctx->x11_screen, magic)) if (newlyopened && !VA_DRIAuthConnection(ctx->native_dpy, ctx->x11_screen, magic))
goto err_out1; goto err_out1;
if (drmMap(dri_state->fd, dri_state->hSAREA, SAREA_MAX, &dri_state->pSAREA)) if (drmMap(dri_state->fd, dri_state->hSAREA, SAREA_MAX, &dri_state->pSAREA))
goto err_out1; goto err_out1;
if (!VA_DRICreateContext((Display *)ctx->native_dpy, ctx->x11_screen, if (!VA_DRICreateContext(ctx->native_dpy, ctx->x11_screen,
DefaultVisual((Display *)ctx->native_dpy, ctx->x11_screen), DefaultVisual(ctx->native_dpy, ctx->x11_screen),
&dri_state->hwContextID, &dri_state->hwContext)) &dri_state->hwContextID, &dri_state->hwContext))
goto err_out1; goto err_out1;
...@@ -142,7 +142,7 @@ err_out1: ...@@ -142,7 +142,7 @@ err_out1:
if (dri_state->fd >= 0) if (dri_state->fd >= 0)
drmCloseOnce(dri_state->fd); drmCloseOnce(dri_state->fd);
VA_DRICloseConnection((Display *)ctx->native_dpy, ctx->x11_screen); VA_DRICloseConnection(ctx->native_dpy, ctx->x11_screen);
err_out0: err_out0:
if (*driver_name) if (*driver_name)
......
...@@ -50,7 +50,7 @@ dri2CreateDrawable(VADriverContextP ctx, XID x_drawable) ...@@ -50,7 +50,7 @@ dri2CreateDrawable(VADriverContextP ctx, XID x_drawable)
dri2_drawable->base.x_drawable = x_drawable; dri2_drawable->base.x_drawable = x_drawable;
dri2_drawable->base.x = 0; dri2_drawable->base.x = 0;
dri2_drawable->base.y = 0; dri2_drawable->base.y = 0;
VA_DRI2CreateDrawable((Display *)ctx->native_dpy, x_drawable); VA_DRI2CreateDrawable(ctx->native_dpy, x_drawable);
return &dri2_drawable->base; return &dri2_drawable->base;
} }
...@@ -58,7 +58,7 @@ dri2CreateDrawable(VADriverContextP ctx, XID x_drawable) ...@@ -58,7 +58,7 @@ dri2CreateDrawable(VADriverContextP ctx, XID x_drawable)
static void static void
dri2DestroyDrawable(VADriverContextP ctx, struct dri_drawable *dri_drawable) dri2DestroyDrawable(VADriverContextP ctx, struct dri_drawable *dri_drawable)
{ {
VA_DRI2DestroyDrawable((Display *)ctx->native_dpy, dri_drawable->x_drawable); VA_DRI2DestroyDrawable(ctx->native_dpy, dri_drawable->x_drawable);
free(dri_drawable); free(dri_drawable);
} }
...@@ -161,14 +161,14 @@ isDRI2Connected(VADriverContextP ctx, char **driver_name) ...@@ -161,14 +161,14 @@ isDRI2Connected(VADriverContextP ctx, char **driver_name)
*driver_name = NULL; *driver_name = NULL;
dri_state->fd = -1; dri_state->fd = -1;
dri_state->driConnectedFlag = VA_NONE; dri_state->driConnectedFlag = VA_NONE;
if (!VA_DRI2QueryExtension((Display *)ctx->native_dpy, &event_base, &error_base)) if (!VA_DRI2QueryExtension(ctx->native_dpy, &event_base, &error_base))
goto err_out; goto err_out;
if (!VA_DRI2QueryVersion((Display *)ctx->native_dpy, &major, &minor)) if (!VA_DRI2QueryVersion(ctx->native_dpy, &major, &minor))
goto err_out; goto err_out;
if (!VA_DRI2Connect((Display *)ctx->native_dpy, RootWindow((Display *)ctx->native_dpy, ctx->x11_screen), if (!VA_DRI2Connect(ctx->native_dpy, RootWindow(ctx->native_dpy, ctx->x11_screen),
driver_name, &device_name)) driver_name, &device_name))
goto err_out; goto err_out;
...@@ -181,7 +181,7 @@ isDRI2Connected(VADriverContextP ctx, char **driver_name) ...@@ -181,7 +181,7 @@ isDRI2Connected(VADriverContextP ctx, char **driver_name)
if (drmGetMagic(dri_state->fd, &magic)) if (drmGetMagic(dri_state->fd, &magic))
goto err_out; goto err_out;
if (!VA_DRI2Authenticate((Display *)ctx->native_dpy, RootWindow((Display *)ctx->native_dpy, ctx->x11_screen), if (!VA_DRI2Authenticate(ctx->native_dpy, RootWindow(ctx->native_dpy, ctx->x11_screen),
magic)) magic))
goto err_out; goto err_out;
......
...@@ -50,7 +50,7 @@ do_drawable_hash(VADriverContextP ctx, XID drawable) ...@@ -50,7 +50,7 @@ do_drawable_hash(VADriverContextP ctx, XID drawable)
dri_drawable = dri_state->createDrawable(ctx, drawable); dri_drawable = dri_state->createDrawable(ctx, drawable);
dri_drawable->x_drawable = drawable; dri_drawable->x_drawable = drawable;
dri_drawable->is_window = is_window((Display *)ctx->native_dpy, drawable); dri_drawable->is_window = is_window(ctx->native_dpy, drawable);
dri_drawable->next = dri_state->drawable_hash[index]; dri_drawable->next = dri_state->drawable_hash[index];
dri_state->drawable_hash[index] = dri_drawable; dri_state->drawable_hash[index] = dri_drawable;
......
...@@ -107,12 +107,12 @@ static VAStatus va_NVCTRL_GetDriverName ( ...@@ -107,12 +107,12 @@ static VAStatus va_NVCTRL_GetDriverName (
int direct_capable, driver_major, driver_minor, driver_patch; int direct_capable, driver_major, driver_minor, driver_patch;
Bool result; Bool result;
result = VA_NVCTRLQueryDirectRenderingCapable((Display *)ctx->native_dpy, ctx->x11_screen, result = VA_NVCTRLQueryDirectRenderingCapable(ctx->native_dpy, ctx->x11_screen,
&direct_capable); &direct_capable);
if (!result || !direct_capable) if (!result || !direct_capable)
return VA_STATUS_ERROR_UNKNOWN; return VA_STATUS_ERROR_UNKNOWN;
result = VA_NVCTRLGetClientDriverName((Display *)ctx->native_dpy, ctx->x11_screen, result = VA_NVCTRLGetClientDriverName(ctx->native_dpy, ctx->x11_screen,
&driver_major, &driver_minor, &driver_major, &driver_minor,
&driver_patch, driver_name); &driver_patch, driver_name);
if (!result) if (!result)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment