mesa/src/glx/dri_common_interop.c
Emil Velikov 13faddb6b8 mesa_glinterop: remove mesa_glinterop typedefs
As is there are two places that do the typedefs - dri_interface.h and
this header. As we cannot include the former in here, just drop the
typedefs and use the struct directly (as needed).

This is required because typedef redefinition is C11 feature which is
not supported on all the versions of GCC used to build mesa.

v2: Kill the typedef alltogether, as per Marek.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96236
Cc: Vinson Lee <vlee@freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
2016-05-30 17:53:44 +01:00

92 lines
3.2 KiB
C

/*
* Copyright © 2013 Intel Corporation
*
* 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.
*/
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
#include "glxclient.h"
#include "glx_error.h"
#include "dri_interface.h"
#include "dri2_priv.h"
#if defined(HAVE_DRI3)
#include "dri3_priv.h"
#endif
#include "GL/mesa_glinterop.h"
_X_HIDDEN int
dri2_interop_query_device_info(struct glx_context *ctx,
struct mesa_glinterop_device_info *out)
{
struct dri2_screen *psc = (struct dri2_screen*)ctx->psc;
struct dri2_context *drictx = (struct dri2_context*)ctx;
if (!psc->interop)
return MESA_GLINTEROP_UNSUPPORTED;
return psc->interop->query_device_info(drictx->driContext, out);
}
_X_HIDDEN int
dri2_interop_export_object(struct glx_context *ctx,
struct mesa_glinterop_export_in *in,
struct mesa_glinterop_export_out *out)
{
struct dri2_screen *psc = (struct dri2_screen*)ctx->psc;
struct dri2_context *drictx = (struct dri2_context*)ctx;
if (!psc->interop)
return MESA_GLINTEROP_UNSUPPORTED;
return psc->interop->export_object(drictx->driContext, in, out);
}
#if defined(HAVE_DRI3)
_X_HIDDEN int
dri3_interop_query_device_info(struct glx_context *ctx,
struct mesa_glinterop_device_info *out)
{
struct dri3_screen *psc = (struct dri3_screen*)ctx->psc;
struct dri3_context *drictx = (struct dri3_context*)ctx;
if (!psc->interop)
return MESA_GLINTEROP_UNSUPPORTED;
return psc->interop->query_device_info(drictx->driContext, out);
}
_X_HIDDEN int
dri3_interop_export_object(struct glx_context *ctx,
struct mesa_glinterop_export_in *in,
struct mesa_glinterop_export_out *out)
{
struct dri3_screen *psc = (struct dri3_screen*)ctx->psc;
struct dri3_context *drictx = (struct dri3_context*)ctx;
if (!psc->interop)
return MESA_GLINTEROP_UNSUPPORTED;
return psc->interop->export_object(drictx->driContext, in, out);
}
#endif /* HAVE_DRI3 */
#endif /* defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) */