mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename gl_common.h to gl2_common.h and remove some file dependencies

Browse Source 
on it
This commit is contained in:
twinaphex 2021-09-26 17:42:12 +02:00
parent 6f36e0a2dd
commit 4b5951bda3
25 changed files with 158 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/common/gl_common.h → gfx/common/gl2_common.h
View File

@ -14,8 +14,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GL_COMMON_H
#define __GL_COMMON_H
#ifndef __GL2_COMMON_H
#define __GL2_COMMON_H
#include <boolean.h>
#include <string.h>
@ -154,9 +154,9 @@ RETRO_BEGIN_DECLS
#endif
#endif
typedef struct gl gl_t;
typedef struct gl2 gl2_t;
struct gl
struct gl2
{
const shader_backend_t *shader;
void *shader_data;
@ -257,16 +257,14 @@ struct gl
bool pbo_readback_enable;
};
#define GL_BIND_TEXTURE(id, wrap_mode, mag_filter, min_filter) \
#define GL2_BIND_TEXTURE(id, wrap_mode, mag_filter, min_filter) \
glBindTexture(GL_TEXTURE_2D, id); \
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_mode); \
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_mode); \
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter); \
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter)
bool gl_query_core_context_in_use(void);
bool gl_load_luts(
bool gl2_load_luts(
const void *shader_data,
GLuint *textures_lut);

182
gfx/drivers/gl2.c
View File

@ -56,7 +56,7 @@
#include "../../retroarch.h"
#include "../../verbosity.h"
#include "../common/gl_common.h"
#include "../common/gl2_common.h"
#ifdef HAVE_THREADS
#include "../video_thread_wrapper.h"
@ -254,7 +254,7 @@ static unsigned gl2_get_alignment(unsigned pitch)
return 8;
}
static bool gl2_shader_info(gl_t *gl,
static bool gl2_shader_info(gl2_t *gl,
video_shader_ctx_info_t *shader_info)
{
if (!shader_info)
@ -265,7 +265,7 @@ static bool gl2_shader_info(gl_t *gl,
return true;
}
static bool gl2_shader_scale(gl_t *gl,
static bool gl2_shader_scale(gl2_t *gl,
video_shader_ctx_scale_t *scaler)
{
if (!scaler || !scaler->scale)
@ -367,7 +367,7 @@ static bool gl2_recreate_fbo(
return false;
}
static void gl2_set_projection(gl_t *gl,
static void gl2_set_projection(gl2_t *gl,
struct video_ortho *ortho, bool allow_rotate)
{
math_matrix_4x4 rot;
@ -386,7 +386,7 @@ static void gl2_set_projection(gl_t *gl,
matrix_4x4_multiply(gl->mvp, rot, gl->mvp_no_rot);
}
static void gl2_set_viewport(gl_t *gl,
static void gl2_set_viewport(gl2_t *gl,
unsigned viewport_width,
unsigned viewport_height,
bool force_full, bool allow_rotate)
@ -483,7 +483,7 @@ static void gl2_set_viewport(gl_t *gl,
}
static void gl2_renderchain_render(
gl_t *gl,
gl2_t *gl,
gl2_renderchain_data_t *chain,
uint64_t frame_count,
const struct video_tex_info *tex_info,
@ -640,7 +640,7 @@ static void gl2_renderchain_render(
gl->coords.tex_coord = gl->tex_info.coord;
}
static void gl2_renderchain_deinit_fbo(gl_t *gl,
static void gl2_renderchain_deinit_fbo(gl2_t *gl,
gl2_renderchain_data_t *chain)
{
if (gl)
@ -670,7 +670,7 @@ static void gl2_renderchain_deinit_fbo(gl_t *gl,
}
static void gl2_renderchain_deinit_hw_render(
gl_t *gl,
gl2_t *gl,
gl2_renderchain_data_t *chain)
{
if (!gl)
@ -687,7 +687,7 @@ static void gl2_renderchain_deinit_hw_render(
gl2_context_bind_hw_render(gl, false);
}
static bool gl2_create_fbo_targets(gl_t *gl, gl2_renderchain_data_t *chain)
static bool gl2_create_fbo_targets(gl2_t *gl, gl2_renderchain_data_t *chain)
{
unsigned i;
@ -775,7 +775,7 @@ static GLenum gl2_min_filter_to_mag(GLenum type)
return type;
}
static void gl2_create_fbo_texture(gl_t *gl,
static void gl2_create_fbo_texture(gl2_t *gl,
gl2_renderchain_data_t *chain,
unsigned i, GLuint texture)
{
@ -814,7 +814,7 @@ static void gl2_create_fbo_texture(gl_t *gl,
wrap_enum = gl2_wrap_type_to_enum(wrap_type);
GL_BIND_TEXTURE(texture, wrap_enum, mag_filter, min_filter);
GL2_BIND_TEXTURE(texture, wrap_enum, mag_filter, min_filter);
fp_fbo = chain->fbo_scale[i].fp_fbo;
@ -890,7 +890,7 @@ static void gl2_create_fbo_texture(gl_t *gl,
}
}
static void gl2_create_fbo_textures(gl_t *gl,
static void gl2_create_fbo_textures(gl2_t *gl,
gl2_renderchain_data_t *chain)
{
int i;
@ -918,7 +918,7 @@ static void gl2_create_fbo_textures(gl_t *gl,
* we have to recalculate geometry of our FBO. */
static void gl2_renderchain_recompute_pass_sizes(
gl_t *gl,
gl2_t *gl,
gl2_renderchain_data_t *chain,
unsigned width, unsigned height,
unsigned vp_width, unsigned vp_height)
@ -1022,7 +1022,7 @@ static void gl2_renderchain_recompute_pass_sizes(
}
static void gl2_renderchain_start_render(
gl_t *gl,
gl2_t *gl,
gl2_renderchain_data_t *chain)
{
/* Used when rendering to an FBO.
@ -1055,7 +1055,7 @@ static void gl2_renderchain_start_render(
/* Set up render to texture. */
static void gl2_renderchain_init(
gl_t *gl,
gl2_t *gl,
gl2_renderchain_data_t *chain,
unsigned fbo_width, unsigned fbo_height)
{
@ -1164,7 +1164,7 @@ static void gl2_renderchain_init(
}
static bool gl2_renderchain_init_hw_render(
gl_t *gl,
gl2_t *gl,
gl2_renderchain_data_t *chain,
unsigned width, unsigned height)
{
@ -1265,7 +1265,7 @@ static bool gl2_renderchain_init_hw_render(
}
static void gl2_renderchain_bind_prev_texture(
gl_t *gl,
gl2_t *gl,
gl2_renderchain_data_t *chain,
const struct video_tex_info *tex_info)
{
@ -1288,7 +1288,7 @@ static void gl2_renderchain_bind_prev_texture(
}
static bool gl2_renderchain_read_viewport(
gl_t *gl,
gl2_t *gl,
uint8_t *buffer, bool is_idle)
{
unsigned num_pixels = 0;
@ -1401,7 +1401,7 @@ error:
#endif
static void gl2_renderchain_copy_frame(
gl_t *gl,
gl2_t *gl,
gl2_renderchain_data_t *chain,
bool use_rgba,
const void *frame,
@ -1544,7 +1544,7 @@ static void gl2_renderchain_copy_frame(
#endif
static void gl2_renderchain_readback(
gl_t *gl,
gl2_t *gl,
void *chain_data,
unsigned alignment,
unsigned fmt, unsigned type,
@ -1604,7 +1604,7 @@ static void gl2_renderchain_fence_free(void *data,
}
static void gl2_renderchain_init_texture_reference(
gl_t *gl,
gl2_t *gl,
gl2_renderchain_data_t *chain,
unsigned i,
unsigned internal_fmt, unsigned texture_fmt,
@ -1630,7 +1630,7 @@ static void gl2_renderchain_init_texture_reference(
#endif
}
static void gl2_renderchain_resolve_extensions(gl_t *gl,
static void gl2_renderchain_resolve_extensions(gl2_t *gl,
gl2_renderchain_data_t *chain,
const char *context_ident,
const video_info_t *video)
@ -1710,7 +1710,7 @@ static void gl_load_texture_data(
break;
}
GL_BIND_TEXTURE(id, wrap, mag_filter, min_filter);
GL2_BIND_TEXTURE(id, wrap, mag_filter, min_filter);
glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
glTexImage2D(GL_TEXTURE_2D,
@ -1771,7 +1771,7 @@ static bool gl2_add_lut(
return true;
}
bool gl_load_luts(
bool gl2_load_luts(
const void *shader_data,
GLuint *textures_lut)
{
@ -1801,7 +1801,7 @@ bool gl_load_luts(
}
#ifdef HAVE_OVERLAY
static void gl2_free_overlay(gl_t *gl)
static void gl2_free_overlay(gl2_t *gl)
{
glDeleteTextures(gl->overlays, gl->overlay_tex);
@ -1822,7 +1822,7 @@ static void gl2_overlay_vertex_geom(void *data,
float w, float h)
{
GLfloat *vertex = NULL;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return;
@ -1855,7 +1855,7 @@ static void gl2_overlay_tex_geom(void *data,
GLfloat w, GLfloat h)
{
GLfloat *tex = NULL;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return;
@ -1872,7 +1872,7 @@ static void gl2_overlay_tex_geom(void *data,
tex[7] = y + h;
}
static void gl2_render_overlay(gl_t *gl)
static void gl2_render_overlay(gl2_t *gl)
{
unsigned i;
unsigned width = gl->video_width;
@ -1914,7 +1914,7 @@ static void gl2_render_overlay(gl_t *gl)
static void gl2_set_viewport_wrapper(void *data, unsigned viewport_width,
unsigned viewport_height, bool force_full, bool allow_rotate)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
gl2_set_viewport(gl,
viewport_width, viewport_height, force_full, allow_rotate);
}
@ -2030,7 +2030,7 @@ static bool gl_shader_driver_init(video_shader_ctx_init_t *init)
return true;
}
static bool gl2_shader_init(gl_t *gl, const gfx_ctx_driver_t *ctx_driver,
static bool gl2_shader_init(gl2_t *gl, const gfx_ctx_driver_t *ctx_driver,
struct retro_hw_render_callback *hwr
)
{
@ -2093,7 +2093,7 @@ static bool gl2_shader_init(gl_t *gl, const gfx_ctx_driver_t *ctx_driver,
static uintptr_t gl2_get_current_framebuffer(void *data)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl || !gl->has_fbo)
return 0;
return gl->hw_render_fbo[(gl->tex_index + 1) % gl->textures];
@ -2101,7 +2101,7 @@ static uintptr_t gl2_get_current_framebuffer(void *data)
static void gl2_set_rotation(void *data, unsigned rotation)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return;
@ -2113,13 +2113,13 @@ static void gl2_set_rotation(void *data, unsigned rotation)
static void gl2_set_video_mode(void *data, unsigned width, unsigned height,
bool fullscreen)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (gl->ctx_driver->set_video_mode)
gl->ctx_driver->set_video_mode(gl->ctx_data,
width, height, fullscreen);
}
static void gl2_update_input_size(gl_t *gl, unsigned width,
static void gl2_update_input_size(gl2_t *gl, unsigned width,
unsigned height, unsigned pitch, bool clear)
{
float xamt, yamt;
@ -2162,7 +2162,7 @@ static void gl2_update_input_size(gl_t *gl, unsigned width,
SET_TEXTURE_COORDS(gl->tex_info.coord, xamt, yamt);
}
static void gl2_init_textures_data(gl_t *gl)
static void gl2_init_textures_data(gl2_t *gl)
{
unsigned i;
@ -2183,7 +2183,7 @@ static void gl2_init_textures_data(gl_t *gl)
}
}
static void gl2_init_textures(gl_t *gl)
static void gl2_init_textures(gl2_t *gl)
{
unsigned i;
GLenum internal_fmt = gl->internal_fmt;
@ -2226,7 +2226,7 @@ static void gl2_init_textures(gl_t *gl)
for (i = 0; i < gl->textures; i++)
{
GL_BIND_TEXTURE(gl->texture[i], gl->wrap_mode, gl->tex_mag_filter,
GL2_BIND_TEXTURE(gl->texture[i], gl->wrap_mode, gl->tex_mag_filter,
gl->tex_min_filter);
gl2_renderchain_init_texture_reference(
@ -2238,7 +2238,7 @@ static void gl2_init_textures(gl_t *gl)
glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
}
static INLINE void gl2_set_shader_viewports(gl_t *gl)
static INLINE void gl2_set_shader_viewports(gl2_t *gl)
{
unsigned i;
unsigned width = gl->video_width;
@ -2261,7 +2261,7 @@ static void gl2_set_texture_frame(void *data,
? TEXTURE_FILTER_LINEAR
: TEXTURE_FILTER_NEAREST;
unsigned base_size = rgb32 ? sizeof(uint32_t) : sizeof(uint16_t);
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return;
@ -2284,7 +2284,7 @@ static void gl2_set_texture_frame(void *data,
static void gl2_set_texture_enable(void *data, bool state, bool full_screen)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return;
@ -2293,7 +2293,7 @@ static void gl2_set_texture_enable(void *data, bool state, bool full_screen)
gl->menu_texture_full_screen = full_screen;
}
static void gl2_render_osd_background(gl_t *gl, const char *msg)
static void gl2_render_osd_background(gl2_t *gl, const char *msg)
{
video_coords_t coords;
struct uniform_info uniform_param;
@ -2406,7 +2406,7 @@ static void gl2_render_osd_background(gl_t *gl, const char *msg)
static void gl2_show_mouse(void *data, bool state)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (gl && gl->ctx_driver->show_mouse)
gl->ctx_driver->show_mouse(gl->ctx_data, state);
@ -2414,7 +2414,7 @@ static void gl2_show_mouse(void *data, bool state)
static struct video_shader *gl2_get_current_shader(void *data)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return NULL;
@ -2423,7 +2423,7 @@ static struct video_shader *gl2_get_current_shader(void *data)
}
#if defined(HAVE_MENU)
static INLINE void gl2_draw_texture(gl_t *gl)
static INLINE void gl2_draw_texture(gl2_t *gl)
{
GLfloat color[16];
unsigned width = gl->video_width;
@ -2479,7 +2479,7 @@ static INLINE void gl2_draw_texture(gl_t *gl)
}
#endif
static void gl2_pbo_async_readback(gl_t *gl)
static void gl2_pbo_async_readback(gl2_t *gl)
{
#ifdef HAVE_OPENGLES
GLenum fmt = GL_RGBA;
@ -2510,7 +2510,7 @@ static float video_layout_layer_tex_coord[] = {
1.0f, 0.0f,
};
static void gl2_video_layout_fbo_init(gl_t *gl, unsigned width, unsigned height)
static void gl2_video_layout_fbo_init(gl2_t *gl, unsigned width, unsigned height)
{
glGenTextures(1, &gl->video_layout_fbo_texture);
glBindTexture(GL_TEXTURE_2D, gl->video_layout_fbo_texture);
@ -2531,7 +2531,7 @@ static void gl2_video_layout_fbo_init(gl_t *gl, unsigned width, unsigned height)
gl2_bind_fb(0);
}
static void gl2_video_layout_fbo_free(gl_t *gl)
static void gl2_video_layout_fbo_free(gl2_t *gl)
{
if (gl->video_layout_fbo)
{
@ -2546,7 +2546,7 @@ static void gl2_video_layout_fbo_free(gl_t *gl)
}
}
static void gl2_video_layout_viewport(gl_t *gl)
static void gl2_video_layout_viewport(gl2_t *gl)
{
if (!video_layout_valid())
return;
@ -2585,7 +2585,7 @@ static void gl2_video_layout_viewport(gl_t *gl)
}
}
static void gl2_video_layout_render(gl_t *gl)
static void gl2_video_layout_render(gl2_t *gl)
{
int i;
@ -2601,7 +2601,7 @@ static void gl2_video_layout_render(gl_t *gl)
glDisable(GL_BLEND);
}
static void gl2_video_layout_init(gl_t *gl)
static void gl2_video_layout_init(gl2_t *gl)
{
uint32_t px;
@ -2616,7 +2616,7 @@ static void gl2_video_layout_init(gl_t *gl)
sizeof(uint32_t), 1, 1, &px, sizeof(uint32_t));
}
static void gl2_video_layout_free(gl_t *gl)
static void gl2_video_layout_free(gl2_t *gl)
{
gl2_video_layout_fbo_free(gl);
@ -2652,8 +2652,8 @@ static void gl2_video_layout_free_image(void *video_driver_data, void *image)
static void gl2_video_layout_layer_begin(const video_layout_render_info_t *info)
{
gl_t *gl;
gl = (gl_t*)info->video_driver_data;
gl2_t *gl;
gl = (gl2_t*)info->video_driver_data;
gl2_bind_fb(gl->video_layout_fbo);
@ -2674,7 +2674,7 @@ static void gl2_video_layout_image(
int i;
float coord[8];
float color[16];
gl_t *gl = (gl_t*)info->video_driver_data;
gl2_t *gl = (gl2_t*)info->video_driver_data;
video_layout_bounds_t b = info->bounds;
b.x /= gl->video_width;
@ -2724,8 +2724,8 @@ static void gl2_video_layout_counter(const video_layout_render_info_t *info, int
static void gl2_video_layout_rect(const video_layout_render_info_t *info)
{
gl_t *gl;
gl = (gl_t*)info->video_driver_data;
gl2_t *gl;
gl = (gl2_t*)info->video_driver_data;
gl2_video_layout_image(info, (void*)(uintptr_t)gl->video_layout_white_texture, NULL);
}
@ -2752,8 +2752,8 @@ static void gl2_video_layout_led_seg(const video_layout_render_info_t *info, vid
static void gl2_video_layout_layer_end(const video_layout_render_info_t *info, video_layout_blend_t blend_type)
{
gl_t *gl;
gl = (gl_t*)info->video_driver_data;
gl2_t *gl;
gl = (gl2_t*)info->video_driver_data;
switch (blend_type)
{
@ -2814,7 +2814,7 @@ static bool gl2_frame(void *data, const void *frame,
{
video_shader_ctx_params_t params;
struct video_tex_info feedback_info;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
gl2_renderchain_data_t *chain = (gl2_renderchain_data_t*)gl->renderchain_data;
unsigned width = gl->video_width;
unsigned height = gl->video_height;
@ -3150,7 +3150,7 @@ static bool gl2_frame(void *data, const void *frame,
return true;
}
static void gl2_destroy_resources(gl_t *gl)
static void gl2_destroy_resources(gl2_t *gl)
{
if (gl)
{
@ -3164,7 +3164,7 @@ static void gl2_destroy_resources(gl_t *gl)
gl_query_core_context_unset();
}
static void gl2_deinit_chain(gl_t *gl)
static void gl2_deinit_chain(gl2_t *gl)
{
if (!gl)
return;
@ -3176,7 +3176,7 @@ static void gl2_deinit_chain(gl_t *gl)
static void gl2_free(void *data)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return;
@ -3247,7 +3247,7 @@ static void gl2_set_nonblock_state(
unsigned swap_interval)
{
int interval = 0;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return;
@ -3266,7 +3266,7 @@ static void gl2_set_nonblock_state(
gl2_context_bind_hw_render(gl, true);
}
static bool gl2_resolve_extensions(gl_t *gl, const char *context_ident, const video_info_t *video)
static bool gl2_resolve_extensions(gl2_t *gl, const char *context_ident, const video_info_t *video)
{
settings_t *settings = config_get_ptr();
bool video_hard_sync = settings->bools.video_hard_sync;
@ -3344,7 +3344,7 @@ static bool gl2_resolve_extensions(gl_t *gl, const char *context_ident, const vi
return true;
}
static INLINE void gl2_set_texture_fmts(gl_t *gl, bool rgb32)
static INLINE void gl2_set_texture_fmts(gl2_t *gl, bool rgb32)
{
gl->internal_fmt = RARCH_GL_INTERNAL_FORMAT16;
gl->texture_type = RARCH_GL_TEXTURE_TYPE16;
@ -3377,7 +3377,7 @@ static INLINE void gl2_set_texture_fmts(gl_t *gl, bool rgb32)
#endif
}
static bool gl2_init_pbo_readback(gl_t *gl)
static bool gl2_init_pbo_readback(gl2_t *gl)
{
#if !defined(HAVE_OPENGLES2) && !defined(HAVE_PSGL)
unsigned i;
@ -3423,7 +3423,7 @@ static bool gl2_init_pbo_readback(gl_t *gl)
#endif
}
static const gfx_ctx_driver_t *gl2_get_context(gl_t *gl)
static const gfx_ctx_driver_t *gl2_get_context(gl2_t *gl)
{
const gfx_ctx_driver_t *gfx_ctx = NULL;
void *ctx_data = NULL;
@ -3565,7 +3565,7 @@ static void DEBUG_CALLBACK_TYPE gl2_debug_cb(GLenum source, GLenum type,
}
}
static void gl2_begin_debug(gl_t *gl)
static void gl2_begin_debug(gl2_t *gl)
{
if (gl_check_capability(GL_CAPS_DEBUG))
{
@ -3617,7 +3617,7 @@ static void *gl2_init(const video_info_t *video,
const char *version = NULL;
struct retro_hw_render_callback *hwr = NULL;
char *error_string = NULL;
gl_t *gl = (gl_t*)calloc(1, sizeof(gl_t));
gl2_t *gl = (gl2_t*)calloc(1, sizeof(gl2_t));
const gfx_ctx_driver_t *ctx_driver = gl2_get_context(gl);
if (!gl || !ctx_driver)
@ -3991,7 +3991,7 @@ static bool gl2_alive(void *data)
bool ret = false;
bool quit = false;
bool resize = false;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
unsigned temp_width = gl->video_width;
unsigned temp_height = gl->video_height;
@ -4018,14 +4018,14 @@ static bool gl2_alive(void *data)
static bool gl2_suppress_screensaver(void *data, bool enable)
{
bool enabled = enable;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (gl->ctx_data && gl->ctx_driver->suppress_screensaver)
return gl->ctx_driver->suppress_screensaver(gl->ctx_data, enabled);
return false;
}
static void gl2_update_tex_filter_frame(gl_t *gl)
static void gl2_update_tex_filter_frame(gl2_t *gl)
{
unsigned i, mip_level;
GLenum wrap_mode;
@ -4067,7 +4067,7 @@ static void gl2_update_tex_filter_frame(gl_t *gl)
if (!gl->texture[i])
continue;
GL_BIND_TEXTURE(gl->texture[i], gl->wrap_mode, gl->tex_mag_filter,
GL2_BIND_TEXTURE(gl->texture[i], gl->wrap_mode, gl->tex_mag_filter,
gl->tex_min_filter);
}
@ -4082,7 +4082,7 @@ static bool gl2_set_shader(void *data,
unsigned textures;
video_shader_ctx_init_t init_data;
enum rarch_shader_type fallback;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return false;
@ -4188,7 +4188,7 @@ error:
static void gl2_viewport_info(void *data, struct video_viewport *vp)
{
unsigned top_y, top_dist;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
unsigned width = gl->video_width;
unsigned height = gl->video_height;
@ -4204,7 +4204,7 @@ static void gl2_viewport_info(void *data, struct video_viewport *vp)
static bool gl2_read_viewport(void *data, uint8_t *buffer, bool is_idle)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return false;
@ -4220,7 +4220,7 @@ static bool gl2_read_viewport(void *data, uint8_t *buffer, bool is_idle)
static void* gl2_read_frame_raw(void *data, unsigned *width_p,
unsigned *height_p, size_t *pitch_p)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
unsigned width = gl->last_width[gl->tex_index];
unsigned height = gl->last_height[gl->tex_index];
size_t pitch = gl->tex_w * gl->base_size;
@ -4272,7 +4272,7 @@ static bool gl2_overlay_load(void *data,
const void *image_data, unsigned num_images)
{
unsigned i, j;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
const struct texture_image *images =
(const struct texture_image*)image_data;
@ -4331,7 +4331,7 @@ static bool gl2_overlay_load(void *data,
static void gl2_overlay_enable(void *data, bool state)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return;
@ -4344,7 +4344,7 @@ static void gl2_overlay_enable(void *data, bool state)
static void gl2_overlay_full_screen(void *data, bool enable)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (gl)
gl->overlay_full_screen = enable;
@ -4353,7 +4353,7 @@ static void gl2_overlay_full_screen(void *data, bool enable)
static void gl2_overlay_set_alpha(void *data, unsigned image, float mod)
{
GLfloat *color;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return;
@ -4385,7 +4385,7 @@ static void gl2_get_overlay_interface(void *data,
static retro_proc_address_t gl2_get_proc_address(void *data, const char *sym)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (gl && gl->ctx_driver->get_proc_address)
return gl->ctx_driver->get_proc_address(sym);
@ -4395,7 +4395,7 @@ static retro_proc_address_t gl2_get_proc_address(void *data, const char *sym)
static void gl2_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return;
@ -4410,7 +4410,7 @@ static void gl2_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
static void gl2_apply_state_changes(void *data)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (gl)
gl->should_resize = true;
@ -4419,7 +4419,7 @@ static void gl2_apply_state_changes(void *data)
static void gl2_get_video_output_size(void *data,
unsigned *width, unsigned *height)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl || !gl->ctx_driver || !gl->ctx_driver->get_video_output_size)
return;
gl->ctx_driver->get_video_output_size(
@ -4429,7 +4429,7 @@ static void gl2_get_video_output_size(void *data,
static void gl2_get_video_output_prev(void *data)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl || !gl->ctx_driver || !gl->ctx_driver->get_video_output_prev)
return;
gl->ctx_driver->get_video_output_prev(gl->ctx_data);
@ -4437,7 +4437,7 @@ static void gl2_get_video_output_prev(void *data)
static void gl2_get_video_output_next(void *data)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl || !gl->ctx_driver || !gl->ctx_driver->get_video_output_next)
return;
gl->ctx_driver->get_video_output_next(gl->ctx_data);
@ -4503,7 +4503,7 @@ static uintptr_t gl2_load_texture(void *video_data, void *data,
#ifdef HAVE_THREADS
if (threaded)
{
gl_t *gl = (gl_t*)video_data;
gl2_t *gl = (gl2_t*)video_data;
custom_command_method_t func = video_texture_load_wrap_gl2;
if (gl->ctx_driver->make_current)
@ -4536,7 +4536,7 @@ static void gl2_unload_texture(void *data,
#ifdef HAVE_THREADS
if (threaded)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (gl && gl->ctx_driver)
if (gl->ctx_driver->make_current)
gl->ctx_driver->make_current(false);
@ -4612,7 +4612,7 @@ static bool gl2_gfx_widgets_enabled(void *data)
static bool gl2_has_windowed(void *data)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (gl && gl->ctx_driver)
return gl->ctx_driver->has_windowed;
return false;
@ -4620,7 +4620,7 @@ static bool gl2_has_windowed(void *data)
static bool gl2_focus(void *data)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (gl && gl->ctx_driver && gl->ctx_driver->has_focus)
return gl->ctx_driver->has_focus(gl->ctx_data);
return true;

4
gfx/drivers_context/android_ctx.c
View File

@ -29,10 +29,6 @@
#include "../common/egl_common.h"
#endif
#ifdef HAVE_OPENGLES
#include "../common/gl_common.h"
#endif
#include "../../frontend/frontend_driver.h"
#include "../../frontend/drivers/platform_unix.h"
#include "../../verbosity.h"

4
gfx/drivers_context/drm_ctx.c
View File

@ -46,10 +46,6 @@
#include "../common/egl_common.h"
#endif
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#include "../common/gl_common.h"
#endif
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif

4
gfx/drivers_context/drm_go2_ctx.c
View File

@ -48,10 +48,6 @@
#include "../common/egl_common.h"
#endif
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#include "../common/gl_common.h"
#endif
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif

4
gfx/drivers_context/emscriptenegl_ctx.c
View File

@ -33,10 +33,6 @@
#include "../common/egl_common.h"
#endif
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#include "../common/gl_common.h"
#endif
typedef struct
{
#ifdef HAVE_EGL

4
gfx/drivers_context/mali_fbdev_ctx.c
View File

@ -34,10 +34,6 @@
#include "../common/egl_common.h"
#endif
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#include "../common/gl_common.h"
#endif
#include "../../frontend/frontend_driver.h"
#include "../../verbosity.h"
#include "../../configuration.h"

4
gfx/drivers_context/opendingux_fbdev_ctx.c
View File

@ -25,10 +25,6 @@
#include "../common/egl_common.h"
#endif
#if defined(HAVE_OPENGLES)
#include "../common/gl_common.h"
#endif
#include "../../frontend/frontend_driver.h"
#include "../../verbosity.h"

1
gfx/drivers_context/osmesa_ctx.c
View File

@ -31,7 +31,6 @@
#include "../../configuration.h"
#include "../../verbosity.h"
#include "../common/gl_common.h"
#if (OSMESA_MAJOR_VERSION * 1000 + OSMESA_MINOR_VERSION) >= 11002
#define HAVE_OSMESA_CREATE_CONTEXT_ATTRIBS 1

3
gfx/drivers_context/ps3_ctx.c
View File

@ -29,7 +29,8 @@
#include "../../verbosity.h"
#include <defines/ps3_defines.h>
#include "../../frontend/frontend_driver.h"
#include "../common/gl_common.h"
/* TODO/FIXME - we should have a gl_common.h for functions like glFinish so we don't have to include gl2_common.h here */
#include "../common/gl2_common.h"
typedef struct gfx_ctx_ps3_data
{

10
gfx/drivers_context/qnx_ctx.c
View File

@ -26,12 +26,6 @@
#include "../../config.h"
#endif
#ifdef HAVE_OPENGLES2
#include <GLES2/gl2.h>
#elif HAVE_OPENGLES3
#include <GLES3/gl3.h>
#endif
#ifdef HAVE_EGL
#include <EGL/egl.h>
#endif
@ -40,10 +34,6 @@
#include "../common/egl_common.h"
#endif
#ifdef HAVE_OPENGLES
#include "../common/gl_common.h"
#endif
#include "../../configuration.h"
#include "../../verbosity.h"

1
gfx/drivers_context/sdl_gl_ctx.c
View File

@ -24,7 +24,6 @@
#include "../../configuration.h"
#include "../../verbosity.h"
#include "../common/gl_common.h"
#include "SDL.h"

2
gfx/drivers_context/uwp_egl_ctx.c
View File

@ -49,8 +49,6 @@
#include "../common/egl_common.h"
#endif
#include "../common/gl_common.h"
#ifdef HAVE_ANGLE
#include "../common/angle_common.h"
#endif

4
gfx/drivers_context/vc_egl_ctx.c
View File

@ -41,10 +41,6 @@
#include "../common/egl_common.h"
#endif
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#include "../common/gl_common.h"
#endif
#ifdef HAVE_EGL
#include <EGL/eglext_brcm.h>
#endif

4
gfx/drivers_context/vivante_fbdev_ctx.c
View File

@ -25,10 +25,6 @@
#include "../common/egl_common.h"
#endif
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#include "../common/gl_common.h"
#endif
#include "../../frontend/frontend_driver.h"
#include "../../verbosity.h"

4
gfx/drivers_context/wayland_ctx.c
View File

@ -30,10 +30,6 @@
#include "../common/egl_common.h"
#endif
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#include "../common/gl_common.h"
#endif
#include "../../frontend/frontend_driver.h"
#include "../../input/common/wayland_common.h"
#include "../../input/input_driver.h"

4
gfx/drivers_context/wgl_ctx.c
View File

@ -55,9 +55,9 @@
#endif
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#include "../common/gl_common.h"
#include "../common/gl2_common.h"
#elif defined(HAVE_OPENGL_CORE)
#include "../common/gl_core_common.h"
#include "../common/gl3_common.h"
#elif defined(HAVE_OPENGL1)
#include "../common/gl1_common.h"
#endif

17
gfx/drivers_context/x_ctx.c
View File

@ -44,7 +44,8 @@
#include "../../frontend/frontend_driver.h"
#include "../../input/input_driver.h"
#include "../../verbosity.h"
#include "../common/gl_common.h"
/* TODO/FIXME - we should have a gl_common.h for functions like glFinish so we don't have to include gl2_common.h here */
#include "../common/gl2_common.h"
#include "../common/x11_common.h"
#ifdef HAVE_XINERAMA
@ -697,25 +698,25 @@ static bool gfx_ctx_x_set_video_mode(void *data,
*/
{
int i;
int gl_versions[][2] = {{4, 6}, {4, 5}, {4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0}, {3, 3}, {3, 2}, {3, 1}, {3, 0}};
int (*versions)[2];
int gl_versions[][2] = {{4, 6}, {4, 5}, {4, 4}, {4, 3}, {4, 2}, {4, 1}, {4, 0}, {3, 3}, {3, 2}, {3, 1}, {3, 0}};
#ifdef HAVE_OPENGLES3
int gles_versions[][2] = {{3, 2}, {3, 1}, {3, 0}, {2, 0}, {1, 1}, {1, 0}};
#else
int gles_versions[][2] = {{2, 0}, {1, 1}, {1, 0}};
#endif
int gl_version_rows = ARRAY_SIZE(gl_versions);
int gles_version_rows = ARRAY_SIZE(gles_versions);
int (*versions)[2];
int version_rows = 0;
int gl_version_rows = ARRAY_SIZE(gl_versions);
int gles_version_rows = ARRAY_SIZE(gles_versions);
int version_rows = 0;
if (x_api == GFX_CTX_OPENGL_API)
{
versions = gl_versions;
versions = gl_versions;
version_rows = gl_version_rows;
}
else
{
versions = gles_versions;
versions = gles_versions;
version_rows = gles_version_rows;
}

1
gfx/drivers_context/x_vk_ctx.c
View File

@ -32,7 +32,6 @@
#include "../../frontend/frontend_driver.h"
#include "../../input/input_driver.h"
#include "../../verbosity.h"
#include "../common/gl_common.h"
#include "../common/x11_common.h"
#ifdef HAVE_XINERAMA

1
gfx/drivers_context/xegl_ctx.c
View File

@ -31,7 +31,6 @@
#include "../../verbosity.h"
#include "../common/egl_common.h"
#include "../common/gl_common.h"
#include "../common/x11_common.h"
#ifdef HAVE_XINERAMA

78
gfx/drivers_display/gfx_display_gl2.c
View File

@ -21,7 +21,7 @@
#include "../../retroarch.h"
#include "../font_driver.h"
#include "../common/gl_common.h"
#include "../common/gl2_common.h"
#include "../gfx_display.h"
@ -68,33 +68,33 @@ static bool scissor_is_outside_rectangle(
#define MALI_BUG
#endif
static const GLfloat gl_vertexes[] = {
static const GLfloat gl2_vertexes[] = {
0, 0,
1, 0,
0, 1,
1, 1
};
static const GLfloat gl_tex_coords[] = {
static const GLfloat gl2_tex_coords[] = {
0, 1,
1, 1,
0, 0,
1, 0
};
static const float *gfx_display_gl_get_default_vertices(void)
static const float *gfx_display_gl2_get_default_vertices(void)
{
return &gl_vertexes[0];
return &gl2_vertexes[0];
}
static const float *gfx_display_gl_get_default_tex_coords(void)
static const float *gfx_display_gl2_get_default_tex_coords(void)
{
return &gl_tex_coords[0];
return &gl2_tex_coords[0];
}
static void *gfx_display_gl_get_default_mvp(void *data)
static void *gfx_display_gl2_get_default_mvp(void *data)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl)
return NULL;
@ -119,9 +119,9 @@ static GLenum gfx_display_prim_to_gl_enum(
return 0;
}
static void gfx_display_gl_blend_begin(void *data)
static void gfx_display_gl2_blend_begin(void *data)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@ -130,14 +130,14 @@ static void gfx_display_gl_blend_begin(void *data)
true);
}
static void gfx_display_gl_blend_end(void *data)
static void gfx_display_gl2_blend_end(void *data)
{
glDisable(GL_BLEND);
}
#ifdef MALI_BUG
static bool
gfx_display_gl_discard_draw_rectangle(gfx_display_ctx_draw_t *draw,
gfx_display_gl2_discard_draw_rectangle(gfx_display_ctx_draw_t *draw,
unsigned width, unsigned height)
{
static bool mali_4xx_detected = false;
@ -211,16 +211,16 @@ gfx_display_gl_discard_draw_rectangle(gfx_display_ctx_draw_t *draw,
}
#endif
static void gfx_display_gl_draw(gfx_display_ctx_draw_t *draw,
static void gfx_display_gl2_draw(gfx_display_ctx_draw_t *draw,
void *data, unsigned video_width, unsigned video_height)
{
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
if (!gl || !draw)
return;
#ifdef MALI_BUG
if (gfx_display_gl_discard_draw_rectangle(draw, video_width,
if (gfx_display_gl2_discard_draw_rectangle(draw, video_width,
video_height))
{
/*RARCH_WARN("[Menu]: discarded draw rect: %.4i %.4i %.4i %.4i\n",
@ -230,11 +230,11 @@ static void gfx_display_gl_draw(gfx_display_ctx_draw_t *draw,
#endif
if (!draw->coords->vertex)
draw->coords->vertex = &gl_vertexes[0];
draw->coords->vertex = &gl2_vertexes[0];
if (!draw->coords->tex_coord)
draw->coords->tex_coord = &gl_tex_coords[0];
draw->coords->tex_coord = &gl2_tex_coords[0];
if (!draw->coords->lut_tex_coord)
draw->coords->lut_tex_coord = &gl_tex_coords[0];
draw->coords->lut_tex_coord = &gl2_tex_coords[0];
glViewport(draw->x, draw->y, draw->width, draw->height);
glBindTexture(GL_TEXTURE_2D, (GLuint)draw->texture);
@ -251,7 +251,7 @@ static void gfx_display_gl_draw(gfx_display_ctx_draw_t *draw,
gl->coords.color = gl->white_color_ptr;
}
static void gfx_display_gl_draw_pipeline(
static void gfx_display_gl2_draw_pipeline(
gfx_display_ctx_draw_t *draw,
gfx_display_t *p_disp,
void *data,
@ -260,7 +260,7 @@ static void gfx_display_gl_draw_pipeline(
{
#ifdef HAVE_SHADERPIPELINE
struct uniform_info uniform_param;
gl_t *gl = (gl_t*)data;
gl2_t *gl = (gl2_t*)data;
static float t = 0;
video_coord_array_t *ca = &p_disp->dispca;
@ -331,7 +331,7 @@ static void gfx_display_gl_draw_pipeline(
#endif
}
static bool gfx_display_gl_font_init_first(
static bool gfx_display_gl2_font_init_first(
void **font_handle, void *video_data,
const char *font_path, float menu_font_size,
bool is_threaded)
@ -345,7 +345,7 @@ static bool gfx_display_gl_font_init_first(
return true;
}
static void gfx_display_gl_scissor_begin(
static void gfx_display_gl2_scissor_begin(
void *data,
unsigned video_width,
unsigned video_height,
@ -356,18 +356,18 @@ static void gfx_display_gl_scissor_begin(
glEnable(GL_SCISSOR_TEST);
#ifdef MALI_BUG
/* TODO/FIXME: If video width/height changes between
* a call of gfx_display_gl_scissor_begin() and the
* next call of gfx_display_gl_draw() (or if
* gfx_display_gl_scissor_begin() is called before the
* first call of gfx_display_gl_draw()), the scissor
* a call of gfx_display_gl2_scissor_begin() and the
* next call of gfx_display_gl2_draw() (or if
* gfx_display_gl2_scissor_begin() is called before the
* first call of gfx_display_gl2_draw()), the scissor
* rectangle set here will be overwritten by the initialisation
* procedure inside gfx_display_gl_discard_draw_rectangle(),
* procedure inside gfx_display_gl2_discard_draw_rectangle(),
* causing the next frame to render glitched content */
scissor_set_rectangle(x, x + width - 1, y, y + height - 1, 1);
#endif
}
static void gfx_display_gl_scissor_end(
static void gfx_display_gl2_scissor_end(
void *data,
unsigned video_width,
unsigned video_height)
@ -380,17 +380,17 @@ static void gfx_display_gl_scissor_end(
}
gfx_display_ctx_driver_t gfx_display_ctx_gl = {
gfx_display_gl_draw,
gfx_display_gl_draw_pipeline,
gfx_display_gl_blend_begin,
gfx_display_gl_blend_end,
gfx_display_gl_get_default_mvp,
gfx_display_gl_get_default_vertices,
gfx_display_gl_get_default_tex_coords,
gfx_display_gl_font_init_first,
gfx_display_gl2_draw,
gfx_display_gl2_draw_pipeline,
gfx_display_gl2_blend_begin,
gfx_display_gl2_blend_end,
gfx_display_gl2_get_default_mvp,
gfx_display_gl2_get_default_vertices,
gfx_display_gl2_get_default_tex_coords,
gfx_display_gl2_font_init_first,
GFX_VIDEO_DRIVER_OPENGL,
"gl",
false,
gfx_display_gl_scissor_begin,
gfx_display_gl_scissor_end
gfx_display_gl2_scissor_begin,
gfx_display_gl2_scissor_end
};

10
gfx/drivers_font/gl2_raster_font.c
View File

@ -21,7 +21,7 @@
#include <string/stdstring.h>
#include <retro_math.h>
#include "../common/gl_common.h"
#include "../common/gl2_common.h"
#include "../font_driver.h"
#include "../../configuration.h"
#include "../../verbosity.h"
@ -44,7 +44,7 @@
typedef struct
{
gl_t *gl;
gl2_t *gl;
GLuint tex;
unsigned tex_width, tex_height;
@ -187,7 +187,7 @@ static void *gl_raster_font_init_font(void *data,
if (!font)
return NULL;
font->gl = (gl_t*)data;
font->gl = (gl2_t*)data;
if (!font_renderer_create_default(
&font->font_driver,
@ -207,7 +207,7 @@ static void *gl_raster_font_init_font(void *data,
glGenTextures(1, &font->tex);
GL_BIND_TEXTURE(font->tex, GL_CLAMP_TO_EDGE, GL_LINEAR, GL_LINEAR);
GL2_BIND_TEXTURE(font->tex, GL_CLAMP_TO_EDGE, GL_LINEAR, GL_LINEAR);
font->atlas = font->font_driver->get_atlas(font->font_data);
font->tex_width = next_pow2(font->atlas->width);
@ -290,7 +290,7 @@ static void gl_raster_font_render_line(
GLfloat font_vertex[2 * 6 * MAX_MSG_LEN_CHUNK];
GLfloat font_color[4 * 6 * MAX_MSG_LEN_CHUNK];
GLfloat font_lut_tex_coord[2 * 6 * MAX_MSG_LEN_CHUNK];
gl_t *gl = font->gl;
gl2_t *gl = font->gl;
const char* msg_end = msg + msg_len;
int x = roundf(pos_x * gl->vp.width);
int y = roundf(pos_y * gl->vp.height);

4
gfx/drivers_shader/shader_gl_cg.c
View File

@ -34,7 +34,7 @@
#endif
#ifdef HAVE_OPENGL
#include "../common/gl_common.h"
#include "../common/gl2_common.h"
#include "../include/Cg/cgGL.h"
#endif
@ -733,7 +733,7 @@ static bool gl_cg_load_preset(void *data, const char *path)
}
}
if (!gl_load_luts(cg->shader, cg->lut_textures))
if (!gl2_load_luts(cg->shader, cg->lut_textures))
{
RARCH_ERR("Failed to load lookup textures ...\n");
return false;

4
gfx/drivers_shader/shader_glsl.c
View File

@ -30,7 +30,7 @@
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES)
#include <gfx/gl_capabilities.h>
#include "../common/gl_common.h"
#include "../common/gl2_common.h"
#endif
#include "shader_glsl.h"
@ -1041,7 +1041,7 @@ static void *gl_glsl_init(void *data, const char *path)
if (!gl_glsl_compile_programs(glsl, &glsl->prg[1]))
goto error;
if (!gl_load_luts(glsl->shader, glsl->lut_textures))
if (!gl2_load_luts(glsl->shader, glsl->lut_textures))
{
RARCH_ERR("[GL]: Failed to load LUTs.\n");
goto error;

6
retroarch.c
View File

@ -203,12 +203,6 @@
#include <rthreads/rthreads.h>
#endif
#if defined(HAVE_OPENGL)
#include "gfx/common/gl_common.h"
#elif defined(HAVE_OPENGL_CORE)
#include "gfx/common/gl_core_common.h"
#endif
#include "autosave.h"
#include "command.h"
#include "config.features.h"