diff --git a/gfx/common/gl1_common.h b/gfx/common/gl1_common.h
index 9a84c1b363..42a802b799 100644
--- a/gfx/common/gl1_common.h
+++ b/gfx/common/gl1_common.h
@@ -110,14 +110,4 @@ typedef struct gl1
    bool overlay_full_screen;
 } gl1_t;
 
-static INLINE void gl1_bind_texture(GLuint id, GLint wrap_mode, GLint mag_filter,
-      GLint 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);
-}
-
 #endif
diff --git a/gfx/drivers/gl1.c b/gfx/drivers/gl1.c
index 2c09ff5173..bee6930066 100644
--- a/gfx/drivers/gl1.c
+++ b/gfx/drivers/gl1.c
@@ -1298,29 +1298,31 @@ static void gl1_load_texture_data(
       unsigned width, unsigned height,
       const void *frame, unsigned base_size)
 {
-   GLint mag_filter, min_filter;
+   GLint filter;
    bool use_rgba    = video_driver_supports_rgba();
    bool rgb32       = (base_size == (sizeof(uint32_t)));
    GLenum wrap      = gl1_wrap_type_to_enum(wrap_type);
 
+   glBindTexture(GL_TEXTURE_2D, id);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap);
+
    /* GL1.x does not have mipmapping support. */
    switch (filter_type)
    {
       case TEXTURE_FILTER_MIPMAP_NEAREST:
       case TEXTURE_FILTER_NEAREST:
-         min_filter = GL_NEAREST;
-         mag_filter = GL_NEAREST;
+         filter = GL_NEAREST;
          break;
       case TEXTURE_FILTER_MIPMAP_LINEAR:
       case TEXTURE_FILTER_LINEAR:
       default:
-         min_filter = GL_LINEAR;
-         mag_filter = GL_LINEAR;
+         filter = GL_LINEAR;
          break;
    }
 
-   gl1_bind_texture(id, wrap, mag_filter, min_filter);
-
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
 #ifndef VITA
    glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
    glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
@@ -1328,13 +1330,21 @@ static void gl1_load_texture_data(
 
    glTexImage2D(GL_TEXTURE_2D,
          0,
-         (use_rgba || !rgb32) ? GL_RGBA : RARCH_GL1_INTERNAL_FORMAT32,
-         width, height, 0,
-         (use_rgba || !rgb32) ? GL_RGBA : RARCH_GL1_TEXTURE_TYPE32,
+         (use_rgba || !rgb32) 
+	 ? GL_RGBA 
+	 : RARCH_GL1_INTERNAL_FORMAT32,
+         width,
+	 height,
+	 0,
+         (use_rgba || !rgb32) 
+	 ? GL_RGBA 
+	 : RARCH_GL1_TEXTURE_TYPE32,
 #ifdef MSB_FIRST
 	 GL_UNSIGNED_INT_8_8_8_8_REV,
 #else
-	 (rgb32) ? RARCH_GL1_FORMAT32 : GL_UNSIGNED_BYTE,
+	 (rgb32) 
+	 ? RARCH_GL1_FORMAT32 
+	 : GL_UNSIGNED_BYTE,
 #endif
 	 frame);
 }
@@ -1351,19 +1361,23 @@ static void video_texture_load_gl1(
 
    /* Generate the OpenGL texture object */
    glGenTextures(1, &id);
-   *idptr = id;
+   *idptr             = id;
 
    if (ti)
    {
-      width  = ti->width;
-      height = ti->height;
-      pixels = ti->pixels;
+      width           = ti->width;
+      height          = ti->height;
+      pixels          = ti->pixels;
    }
 
-   gl1_load_texture_data(id,
-         RARCH_WRAP_EDGE, filter_type,
+   gl1_load_texture_data(
+         id,
+         RARCH_WRAP_EDGE,
+         filter_type,
          4 /* TODO/FIXME - dehardcode */,
-         width, height, pixels,
+         width,
+         height,
+         pixels,
          sizeof(uint32_t) /* TODO/FIXME - dehardcode */
          );
 }
@@ -1372,7 +1386,6 @@ static void video_texture_load_gl1(
 static int video_texture_load_wrap_gl1(void *data)
 {
    uintptr_t id = 0;
-
    if (!data)
       return 0;
    video_texture_load_gl1((struct texture_image*)data,
diff --git a/gfx/drivers_font/gl1_raster_font.c b/gfx/drivers_font/gl1_raster_font.c
index b3feb291fd..dc4d8e40d9 100644
--- a/gfx/drivers_font/gl1_raster_font.c
+++ b/gfx/drivers_font/gl1_raster_font.c
@@ -148,8 +148,11 @@ static void *gl1_raster_font_init(void *data,
          font->gl->ctx_driver->make_current(false);
 
    glGenTextures(1, &font->tex);
-
-   gl1_bind_texture(font->tex, GL_CLAMP, GL_LINEAR, GL_LINEAR);
+   glBindTexture(GL_TEXTURE_2D, font->tex);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 
    font->atlas      = font->font_driver->get_atlas(font->font_data);
    font->tex_width  = next_pow2(font->atlas->width);