From 780bf7427303a951ecc4b4071b6b0600edfc3f28 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 9 Nov 2015 01:50:05 +0100 Subject: [PATCH] Try to not use glDeleteTextures directly outside --- camera/drivers/android.c | 3 ++- gfx/drivers_font/gl_raster_font.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/camera/drivers/android.c b/camera/drivers/android.c index acba089ef2..06e923d4e6 100644 --- a/camera/drivers/android.c +++ b/camera/drivers/android.c @@ -17,6 +17,7 @@ #include #include "../../driver.h" +#include "../../gfx/video_texture.h" typedef struct android_camera { @@ -149,7 +150,7 @@ static void android_camera_stop(void *data) androidcamera->onCameraStop); if (androidcamera->tex) - glDeleteTextures(1, &androidcamera->tex); + video_texture_unload(TEXTURE_BACKEND_OPENGL, (uintptr_t*)&androidcamera->tex); } static bool android_camera_poll(void *data, diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c index 76e07ade74..9274943509 100644 --- a/gfx/drivers_font/gl_raster_font.c +++ b/gfx/drivers_font/gl_raster_font.c @@ -17,6 +17,7 @@ #include "../drivers/gl_common.h" #include "../font_driver.h" #include "../video_shader_driver.h" +#include "../video_texture.h" /* TODO: Move viewport side effects to the caller: it's a source of bugs. */ @@ -185,7 +186,7 @@ static void gl_raster_font_free_font(void *data) if (font->font_driver && font->font_data) font->font_driver->free(font->font_data); - glDeleteTextures(1, &font->tex); + video_texture_unload(TEXTURE_BACKEND_OPENGL, (uintptr_t*)&font->tex); free(font); }