ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename loadTexture to gl_load_texture_image

This commit is contained in:
twinaphex 2016-12-14 16:59:16 +01:00
parent c12fd9c125
commit f9b019c83a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/common/gl_common.c
View File

@ -53,7 +53,7 @@ void gl_ff_matrix(const math_matrix_4x4 *mat)
/* This function should only be used without mipmaps /* This function should only be used without mipmaps
and when data == NULL */ and when data == NULL */
void loadTexture(GLenum target, void gl_load_texture_image(GLenum target,
GLint level, GLint level,
GLint internalFormat, GLint internalFormat,
GLsizei width, GLsizei width,

2
gfx/common/gl_common.h
View File

@ -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); bool gl_query_core_context_in_use(void);
void gl_ff_vertex(const struct video_coords *coords); void gl_ff_vertex(const struct video_coords *coords);
void gl_ff_matrix(const math_matrix_4x4 *mat); void gl_ff_matrix(const math_matrix_4x4 *mat);
void loadTexture(GLenum target, void gl_load_texture_image(GLenum target,
GLint level, GLint level,
GLint internalFormat, GLint internalFormat,
GLsizei width, GLsizei width,

2
gfx/drivers/gl.c
View File

@ -606,7 +606,7 @@ static void gl_init_textures_reference(gl_t *gl, unsigned i,
if (gl->egl_images) if (gl->egl_images)
return; return;
loadTexture(GL_TEXTURE_2D, gl_load_texture_image(GL_TEXTURE_2D,
0, internal_fmt, gl->tex_w, gl->tex_h, 0, texture_type, 0, internal_fmt, gl->tex_w, gl->tex_h, 0, texture_type,
texture_fmt, gl->empty_buf ? gl->empty_buf : NULL); texture_fmt, gl->empty_buf ? gl->empty_buf : NULL);
#endif #endif

8
gfx/drivers/gl_renderchains/render_chain_gl_legacy.c
View File

@ -163,7 +163,7 @@ static bool gl_recreate_fbo(
glDeleteTextures(1, texture); glDeleteTextures(1, texture);
glGenTextures(1, texture); glGenTextures(1, texture);
glBindTexture(GL_TEXTURE_2D, *texture); glBindTexture(GL_TEXTURE_2D, *texture);
loadTexture(GL_TEXTURE_2D, gl_load_texture_image(GL_TEXTURE_2D,
0, RARCH_GL_INTERNAL_FORMAT32, 0, RARCH_GL_INTERNAL_FORMAT32,
fbo_rect->width, fbo_rect->width,
fbo_rect->height, 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) if (fp_fbo && gl->has_fp_fbo)
{ {
RARCH_LOG("[GL]: FBO pass #%d is floating-point.\n", i); 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, gl->fbo_rect[i].width, gl->fbo_rect[i].height,
0, GL_RGBA, GL_FLOAT, NULL); 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->has_srgb_fbo_gles3 ? GL_RGBA : GL_SRGB_ALPHA_EXT,
GL_UNSIGNED_BYTE, NULL); GL_UNSIGNED_BYTE, NULL);
#else #else
loadTexture(GL_TEXTURE_2D, gl_load_texture_image(GL_TEXTURE_2D,
0, GL_SRGB8_ALPHA8, 0, GL_SRGB8_ALPHA8,
gl->fbo_rect[i].width, gl->fbo_rect[i].height, 0, gl->fbo_rect[i].width, gl->fbo_rect[i].height, 0,
GL_RGBA, GL_UNSIGNED_BYTE, NULL); GL_RGBA, GL_UNSIGNED_BYTE, NULL);
@ -572,7 +572,7 @@ static void gl_create_fbo_texture(gl_t *gl, unsigned i, GLuint texture)
#else #else
/* Avoid potential performance /* Avoid potential performance
* reductions on particular platforms. */ * reductions on particular platforms. */
loadTexture(GL_TEXTURE_2D, gl_load_texture_image(GL_TEXTURE_2D,
0, RARCH_GL_INTERNAL_FORMAT32, 0, RARCH_GL_INTERNAL_FORMAT32,
gl->fbo_rect[i].width, gl->fbo_rect[i].height, 0, gl->fbo_rect[i].width, gl->fbo_rect[i].height, 0,
RARCH_GL_TEXTURE_TYPE32, RARCH_GL_FORMAT32, NULL); RARCH_GL_TEXTURE_TYPE32, RARCH_GL_FORMAT32, NULL);