diff --git a/gfx/common/gl_common.c b/gfx/common/gl_common.c index 0af64ce5be..59fe717806 100644 --- a/gfx/common/gl_common.c +++ b/gfx/common/gl_common.c @@ -53,7 +53,7 @@ void gl_ff_matrix(const math_matrix_4x4 *mat) /* This function should only be used without mipmaps and when data == NULL */ -void loadTexture(GLenum target, +void gl_load_texture_image(GLenum target, GLint level, GLint internalFormat, GLsizei width, diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h index a94e0759d4..2e13d95e2d 100644 --- a/gfx/common/gl_common.h +++ b/gfx/common/gl_common.h @@ -177,7 +177,7 @@ static INLINE unsigned gl_wrap_type_to_enum(enum gfx_wrap_type type) bool gl_query_core_context_in_use(void); void gl_ff_vertex(const struct video_coords *coords); void gl_ff_matrix(const math_matrix_4x4 *mat); -void loadTexture(GLenum target, +void gl_load_texture_image(GLenum target, GLint level, GLint internalFormat, GLsizei width, diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 8e796a6984..cbef52184d 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -606,7 +606,7 @@ static void gl_init_textures_reference(gl_t *gl, unsigned i, if (gl->egl_images) return; - loadTexture(GL_TEXTURE_2D, + gl_load_texture_image(GL_TEXTURE_2D, 0, internal_fmt, gl->tex_w, gl->tex_h, 0, texture_type, texture_fmt, gl->empty_buf ? gl->empty_buf : NULL); #endif diff --git a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c index 1ffdfd7d51..5dc1bc0d00 100644 --- a/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c +++ b/gfx/drivers/gl_renderchains/render_chain_gl_legacy.c @@ -163,7 +163,7 @@ static bool gl_recreate_fbo( glDeleteTextures(1, texture); glGenTextures(1, texture); glBindTexture(GL_TEXTURE_2D, *texture); - loadTexture(GL_TEXTURE_2D, + gl_load_texture_image(GL_TEXTURE_2D, 0, RARCH_GL_INTERNAL_FORMAT32, fbo_rect->width, fbo_rect->height, @@ -524,7 +524,7 @@ static void gl_create_fbo_texture(gl_t *gl, unsigned i, GLuint texture) if (fp_fbo && gl->has_fp_fbo) { RARCH_LOG("[GL]: FBO pass #%d is floating-point.\n", i); - loadTexture(GL_TEXTURE_2D, 0, GL_RGBA32F, + gl_load_texture_image(GL_TEXTURE_2D, 0, GL_RGBA32F, gl->fbo_rect[i].width, gl->fbo_rect[i].height, 0, GL_RGBA, GL_FLOAT, NULL); } @@ -555,7 +555,7 @@ static void gl_create_fbo_texture(gl_t *gl, unsigned i, GLuint texture) gl->has_srgb_fbo_gles3 ? GL_RGBA : GL_SRGB_ALPHA_EXT, GL_UNSIGNED_BYTE, NULL); #else - loadTexture(GL_TEXTURE_2D, + gl_load_texture_image(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, gl->fbo_rect[i].width, gl->fbo_rect[i].height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); @@ -572,7 +572,7 @@ static void gl_create_fbo_texture(gl_t *gl, unsigned i, GLuint texture) #else /* Avoid potential performance * reductions on particular platforms. */ - loadTexture(GL_TEXTURE_2D, + gl_load_texture_image(GL_TEXTURE_2D, 0, RARCH_GL_INTERNAL_FORMAT32, gl->fbo_rect[i].width, gl->fbo_rect[i].height, 0, RARCH_GL_TEXTURE_TYPE32, RARCH_GL_FORMAT32, NULL);