mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-25 16:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nits.

Browse Source
This commit is contained in:
Themaister 2014-05-11 19:02:01 +02:00
parent 48331e822a
commit 9d8654cfe2
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/gl.c
View File

@ -544,7 +544,7 @@ static void gl_create_fbo_textures(void *data)
RARCH_LOG("FBO pass #%d is floating-point.\n", i); RARCH_LOG("FBO pass #%d is floating-point.\n", i);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, glTexImage2D(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_UNSIGNED_BYTE, NULL); 0, GL_RGBA, GL_FLOAT, NULL);
} }
else else
#endif #endif

6
gfx/shader_common.c
View File

@ -17,7 +17,6 @@
#include "../retroarch_logger.h" #include "../retroarch_logger.h"
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
// gl_common.c may or may not be a better location for these functions.
void gl_load_texture_data(GLuint obj, const struct texture_image *img, void gl_load_texture_data(GLuint obj, const struct texture_image *img,
GLenum wrap, bool linear, bool mipmap) GLenum wrap, bool linear, bool mipmap)
{ {
@ -25,14 +24,11 @@ void gl_load_texture_data(GLuint obj, const struct texture_image *img,
#ifdef HAVE_PSGL #ifdef HAVE_PSGL
mipmap = false; mipmap = false;
#endif
#ifdef HAVE_OPENGLES2
wrap = GL_CLAMP_TO_EDGE;
#endif #endif
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap);
GLint mag_filter = linear? GL_LINEAR : GL_NEAREST; GLint mag_filter = linear ? GL_LINEAR : GL_NEAREST;
GLint min_filter = linear ? (mipmap ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR) : GLint min_filter = linear ? (mipmap ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR) :
(mipmap ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST); (mipmap ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);