libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-25 08:59:58 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(gl_common.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-02-13 01:50:44 +01:00
parent f3315c256e
commit 748556dd57
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gfx/gl_common.c
View File

@ -79,18 +79,15 @@ void gl_load_texture_data(GLuint id,
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
} }
bool gl_load_luts(const struct video_shader *generic_shader, bool gl_load_luts(const struct video_shader *shader,
GLuint *textures_lut) GLuint *textures_lut)
{ {
unsigned i; unsigned i;
unsigned num_luts = min(generic_shader->luts, GFX_MAX_TEXTURES); unsigned num_luts = min(shader->luts, GFX_MAX_TEXTURES);
if (!generic_shader->luts) if (!shader->luts)
return true; return true;
/* Original shader_glsl.c code only generated one
* texture handle. I assume it was a bug, but if not,
* replace num_luts with 1 when GLSL is used. */
glGenTextures(num_luts, textures_lut); glGenTextures(num_luts, textures_lut);
for (i = 0; i < num_luts; i++) for (i = 0; i < num_luts; i++)
@ -99,19 +96,19 @@ bool gl_load_luts(const struct video_shader *generic_shader,
enum texture_filter_type filter_type = TEXTURE_FILTER_LINEAR; enum texture_filter_type filter_type = TEXTURE_FILTER_LINEAR;
RARCH_LOG("Loading texture image from: \"%s\" ...\n", RARCH_LOG("Loading texture image from: \"%s\" ...\n",
generic_shader->lut[i].path); shader->lut[i].path);
if (!texture_image_load(&img, generic_shader->lut[i].path)) if (!texture_image_load(&img, shader->lut[i].path))
{ {
RARCH_ERR("Failed to load texture image from: \"%s\"\n", RARCH_ERR("Failed to load texture image from: \"%s\"\n",
generic_shader->lut[i].path); shader->lut[i].path);
return false; return false;
} }
if (generic_shader->lut[i].filter == RARCH_FILTER_NEAREST) if (shader->lut[i].filter == RARCH_FILTER_NEAREST)
filter_type = TEXTURE_FILTER_NEAREST; filter_type = TEXTURE_FILTER_NEAREST;
if (generic_shader->lut[i].mipmap) if (shader->lut[i].mipmap)
{ {
if (filter_type == TEXTURE_FILTER_NEAREST) if (filter_type == TEXTURE_FILTER_NEAREST)
filter_type = TEXTURE_FILTER_MIPMAP_NEAREST; filter_type = TEXTURE_FILTER_MIPMAP_NEAREST;
@ -120,7 +117,7 @@ bool gl_load_luts(const struct video_shader *generic_shader,
} }
gl_load_texture_data(textures_lut[i], gl_load_texture_data(textures_lut[i],
generic_shader->lut[i].wrap, shader->lut[i].wrap,
filter_type, 4, filter_type, 4,
img.width, img.height, img.width, img.height,
img.pixels, sizeof(uint32_t)); img.pixels, sizeof(uint32_t));