From 5f2ebce9b1a5001c7244c06be32894e707e1762d Mon Sep 17 00:00:00 2001 From: Mahyar Koshkouei Date: Fri, 29 Dec 2017 18:01:28 +0000 Subject: [PATCH] Remove GL functions I don't need Signed-off-by: Mahyar Koshkouei --- Makefile | 2 +- mpv-libretro.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index b5d3af7..3b03156 100644 --- a/Makefile +++ b/Makefile @@ -113,7 +113,7 @@ else CFLAGS += -O3 endif -OBJECTS := mpv-libretro.o libretro-common/glsym/rglgen.o libretro-common/glsm/glsm.o +OBJECTS := mpv-libretro.o CFLAGS += -Wall -pedantic $(LIBRETRO-COM) $(fpic) ifeq ($(GLES), 1) diff --git a/mpv-libretro.c b/mpv-libretro.c index abb04c7..b914b09 100644 --- a/mpv-libretro.c +++ b/mpv-libretro.c @@ -7,8 +7,6 @@ #include #include -#include -#include #include static struct retro_hw_render_callback hw_render; @@ -119,7 +117,6 @@ void retro_set_environment(retro_environment_t cb) static void context_reset(void) { log_cb(RETRO_LOG_DEBUG, "Context reset.\n"); - rglgen_resolve_symbols(hw_render.get_proc_address); } static void context_destroy(void) @@ -212,7 +209,8 @@ void retro_run(void) { audio_callback(); - mpv_opengl_cb_draw(mpv_gl, 0, 100, 100); + mpv_opengl_cb_draw(mpv_gl, hw_render.get_current_framebuffer(), 100, 100); + video_cb(RETRO_HW_FRAME_BUFFER_VALID, 100, 100, 0); return; } @@ -248,10 +246,9 @@ static void *get_proc_address_mpv(void *fn_ctx, const char *name) return proc_info.addr(name); #endif /* This doesn't work either */ - rglgen_resolve_symbols(hw_render.get_proc_address); log_cb(RETRO_LOG_INFO, "attempting to obtain %s proc using %p at %p\n", name, hw_render.get_proc_address, hw_render.get_proc_address(name)); - return hw_render.get_proc_address(name); + return (void *) hw_render.get_proc_address(name); } bool retro_load_game(const struct retro_game_info *info)