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

Cleanups

This commit is contained in:
twinaphex 2020-10-03 18:25:43 +02:00
parent ecd72b5be6
commit 0e4aa46335
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gfx/drivers_shader/shader_gl_core.cpp
View File

@ -366,8 +366,10 @@ static GLenum convert_glslang_format(glslang_format fmt)
FMT(R32G32B32A32_SFLOAT, RGBA32F); FMT(R32G32B32A32_SFLOAT, RGBA32F);
default: default:
return 0; break;
} }
return 0;
} }
class StaticTexture class StaticTexture
@ -399,32 +401,42 @@ StaticTexture::StaticTexture(string id_, GLuint image_,
glslang_filter_chain_address address) glslang_filter_chain_address address)
: id(std::move(id_)), image(image_) : id(std::move(id_)), image(image_)
{ {
GLenum gl_address = address_to_gl(address); GLenum gl_address = address_to_gl(address);
texture.filter = GLSLANG_FILTER_CHAIN_NEAREST; texture.filter = GLSLANG_FILTER_CHAIN_NEAREST;
texture.mip_filter = GLSLANG_FILTER_CHAIN_NEAREST; texture.mip_filter = GLSLANG_FILTER_CHAIN_NEAREST;
texture.address = address; texture.address = address;
texture.texture.width = width; texture.texture.width = width;
texture.texture.height = height; texture.texture.height = height;
texture.texture.format = 0; texture.texture.format = 0;
texture.texture.image = image; texture.texture.image = image;
if (linear) if (linear)
texture.filter = GLSLANG_FILTER_CHAIN_LINEAR; {
if (mipmap && linear) texture.filter = GLSLANG_FILTER_CHAIN_LINEAR;
texture.mip_filter = GLSLANG_FILTER_CHAIN_LINEAR; if (mipmap)
texture.mip_filter = GLSLANG_FILTER_CHAIN_LINEAR;
}
glBindTexture(GL_TEXTURE_2D, image); glBindTexture(GL_TEXTURE_2D, image);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, gl_address); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, gl_address);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, gl_address); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, gl_address);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, linear ? GL_LINEAR : GL_NEAREST); if (linear)
if (linear && mipmap) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
else if (linear) if (mipmap)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
GL_LINEAR_MIPMAP_LINEAR);
else
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
GL_LINEAR);
}
else else
{
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
}
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
} }