(GL) Get rid of some more _func macros

This commit is contained in:
twinaphex 2014-10-02 15:43:11 +02:00
parent ca004c370c
commit a844c3997a
2 changed files with 2 additions and 8 deletions

View File

@ -1185,7 +1185,7 @@ static void gl_init_textures(gl_t *gl, const video_info_t *video)
// Use regular textures if we use HW render.
gl->egl_images = !gl->hw_render_use && check_eglimage_proc() &&
gl->ctx_driver->init_egl_image_buffer
&& context_init_egl_image_buffer_func(gl, video);
&& gl->ctx_driver->init_egl_image_buffer(gl, video);
#else
(void)video;
#endif
@ -1269,7 +1269,7 @@ static inline void gl_copy_frame(gl_t *gl, const void *frame,
if (gl->egl_images)
{
EGLImageKHR img = 0;
bool new_egl = context_write_egl_image_func(gl,
bool new_egl = gl->ctx_driver->write_egl_image(gl,
frame, width, height, pitch, (gl->base_size == 4),
gl->tex_index, &img);

View File

@ -39,12 +39,6 @@
#define context_bind_hw_render(gl, enable) if (gl->shared_context_use && gl->ctx_driver->bind_hw_render) gl->ctx_driver->bind_hw_render(gl, enable)
#ifdef HAVE_EGL
#define context_init_egl_image_buffer_func(gl, video) gl->ctx_driver->init_egl_image_buffer(gl, video)
#define context_write_egl_image_func(gl, frame, width, height, pitch, base_size, tex_index, img) \
gl->ctx_driver->write_egl_image(gl, frame, width, height, pitch, base_size, tex_index,img)
#endif
#if (!defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES3))
#define HAVE_GL_ASYNC_READBACK
#endif