Commit 5a010800 authored by Alexandre Janniaux's avatar Alexandre Janniaux Committed by Rémi Denis-Courmont
Browse files

opengl: interop: unify type signatures

We don't depend on OpenGL types for the signature anymore.
parent a3803e96
Pipeline #182941 passed with stages
in 35 minutes and 27 seconds
......@@ -68,8 +68,8 @@ typedef struct {
#define CALL_CUDA(func, ...) CudaCheckErr(VLC_OBJECT(interop->gl), devsys->cudaFunctions, devsys->cudaFunctions->func(__VA_ARGS__), #func)
static int tc_nvdec_gl_allocate_texture(const struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height)
static int tc_nvdec_gl_allocate_texture(const struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[])
{
converter_sys_t *p_sys = interop->priv;
vlc_decoder_device *device = p_sys->device;
......@@ -106,8 +106,8 @@ static int tc_nvdec_gl_allocate_texture(const struct vlc_gl_interop *interop, GL
}
static int
tc_nvdec_gl_update(const struct vlc_gl_interop *interop, GLuint textures[],
GLsizei const tex_widths[], GLsizei const tex_heights[],
tc_nvdec_gl_update(const struct vlc_gl_interop *interop, uint32_t textures[],
int32_t const tex_widths[], int32_t const tex_heights[],
picture_t *pic, size_t const plane_offsets[])
{
VLC_UNUSED(plane_offsets);
......
......@@ -80,8 +80,8 @@ ReductMatrix(float *mtx_2x3, const float *mtx_4x4)
}
static int
tc_anop_allocate_textures(const struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height)
tc_anop_allocate_textures(const struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[])
{
(void) tex_width; (void) tex_height;
struct priv *priv = interop->priv;
......@@ -91,8 +91,8 @@ tc_anop_allocate_textures(const struct vlc_gl_interop *interop, GLuint *textures
}
static int
tc_anop_update(struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height,
tc_anop_update(struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[],
picture_t *pic, const size_t *plane_offset)
{
struct priv *priv = interop->priv;
......
......@@ -57,8 +57,8 @@ struct priv
#if TARGET_OS_IPHONE
/* CVOpenGLESTextureCache version (ios) */
static int
tc_cvpx_update(const struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height,
tc_cvpx_update(const struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[],
picture_t *pic, const size_t *plane_offset)
{
(void) plane_offset;
......@@ -115,8 +115,8 @@ tc_cvpx_update(const struct vlc_gl_interop *interop, GLuint *textures,
#else
/* IOSurface version (macos) */
static int
tc_cvpx_update(const struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height,
tc_cvpx_update(const struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[],
picture_t *pic, const size_t *plane_offset)
{
(void) plane_offset;
......
......@@ -97,8 +97,8 @@ struct glpriv
};
static int
GLConvUpdate(const struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height,
GLConvUpdate(const struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[],
picture_t *pic, const size_t *plane_offset)
{
VLC_UNUSED(textures); VLC_UNUSED(tex_width); VLC_UNUSED(tex_height); VLC_UNUSED(plane_offset);
......@@ -163,8 +163,8 @@ GLConvUpdate(const struct vlc_gl_interop *interop, GLuint *textures,
}
static int
GLConvAllocateTextures(const struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height)
GLConvAllocateTextures(const struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[])
{
VLC_UNUSED(tex_width); VLC_UNUSED(tex_height);
struct glpriv *priv = interop->priv;
......
......@@ -178,8 +178,8 @@ error:
}
static int
tc_pbo_update(const struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height,
tc_pbo_update(const struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[],
picture_t *pic, const size_t *plane_offset)
{
(void) plane_offset; assert(plane_offset == NULL);
......@@ -215,8 +215,8 @@ tc_pbo_update(const struct vlc_gl_interop *interop, GLuint *textures,
}
static int
tc_common_allocate_textures(const struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height)
tc_common_allocate_textures(const struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[])
{
const struct priv *priv = interop->priv;
for (unsigned i = 0; i < interop->tex_count; i++)
......@@ -231,7 +231,7 @@ tc_common_allocate_textures(const struct vlc_gl_interop *interop, GLuint *textur
static int
upload_plane(const struct vlc_gl_interop *interop, unsigned tex_idx,
GLsizei width, GLsizei height,
int32_t width, int32_t height,
unsigned pitch, unsigned visible_pitch, const void *pixels)
{
struct priv *priv = interop->priv;
......@@ -288,8 +288,8 @@ upload_plane(const struct vlc_gl_interop *interop, unsigned tex_idx,
}
static int
tc_common_update(const struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height,
tc_common_update(const struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[],
picture_t *pic, const size_t *plane_offset)
{
const struct priv *priv = interop->priv;
......
......@@ -189,8 +189,8 @@ vaegl_init_fourcc(struct priv *priv, unsigned va_fourcc)
}
static int
tc_vaegl_update(const struct vlc_gl_interop *interop, GLuint *textures,
const GLsizei *tex_width, const GLsizei *tex_height,
tc_vaegl_update(const struct vlc_gl_interop *interop, uint32_t textures[],
const int32_t tex_width[], const int32_t tex_height[],
picture_t *pic, const size_t *plane_offset)
{
(void) plane_offset;
......
......@@ -68,8 +68,8 @@ typedef struct {
} converter_sys_t;
static int
tc_vdpau_gl_update(const struct vlc_gl_interop *interop, GLuint textures[],
GLsizei const tex_widths[], GLsizei const tex_heights[],
tc_vdpau_gl_update(const struct vlc_gl_interop *interop, uint32_t textures[],
int32_t const tex_widths[], int32_t const tex_heights[],
picture_t *pic, size_t const plane_offsets[])
{
VLC_UNUSED(tex_widths);
......
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