From 9d8654cfe2d1d925537e7ca186b5c87c9b4118ba Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sun, 11 May 2014 19:02:01 +0200
Subject: [PATCH] Nits.
---
gfx/gl.c | 2 +-
gfx/shader_common.c | 6 +-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/gfx/gl.c b/gfx/gl.c
index a66a0d690d..ae9eb3c4eb 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -544,7 +544,7 @@ static void gl_create_fbo_textures(void *data)
RARCH_LOG("FBO pass #%d is floating-point.\n", i);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F,
gl->fbo_rect[i].width, gl->fbo_rect[i].height,
- 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+ 0, GL_RGBA, GL_FLOAT, NULL);
}
else
#endif
diff --git a/gfx/shader_common.c b/gfx/shader_common.c
index 74228c43df..97bdc7d4f1 100644
--- a/gfx/shader_common.c
+++ b/gfx/shader_common.c
@@ -17,7 +17,6 @@
#include "../retroarch_logger.h"
#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,
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
mipmap = false;
-#endif
-#ifdef HAVE_OPENGLES2
- wrap = GL_CLAMP_TO_EDGE;
#endif
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, 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) :
(mipmap ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter);