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

Last pass filter.

This commit is contained in:
Brandon Wright 2018-05-12 17:36:45 -05:00
parent 41a8ed53c4
commit c9ed910879
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/src/gtk_display_driver_opengl.cpp
View File

@ -226,7 +226,7 @@ S9xOpenGLDisplayDriver::update (int width, int height, int yoffset)
if (using_shaders && using_glsl_shaders) if (using_shaders && using_glsl_shaders)
{ {
glsl_shader->render (texmap, width, height, w, h); glsl_shader->render (texmap, width, height, w, h, x, allocation.height - y - h);
glViewport (x, allocation.height - y - h, w, h); glViewport (x, allocation.height - y - h, w, h);
} }
else if (using_shaders && using_cg_shaders) else if (using_shaders && using_cg_shaders)

16
gtk/src/shaders/glsl.cpp
View File

@ -152,7 +152,7 @@ bool GLSLShader::load_shader_file (char *filename)
GLSLPass pass; GLSLPass pass;
snprintf(key, 256, "::filter_linear%u", i); snprintf(key, 256, "::filter_linear%u", i);
pass.filter = conf.Exists(key) ? conf.GetBool(key) ? GL_LINEAR : GL_NEAREST : GLSL_UNDEFINED; pass.filter = conf.Exists(key) ? (conf.GetBool(key) ? GL_LINEAR : GL_NEAREST) : GLSL_UNDEFINED;
sprintf(key, "::scale_type%u", i); sprintf(key, "::scale_type%u", i);
const char* scaleType = conf.GetString(key, ""); const char* scaleType = conf.GetString(key, "");
@ -543,7 +543,7 @@ bool GLSLShader::load_shader (char *filename)
return true; return true;
} }
void GLSLShader::render(GLuint &orig, int width, int height, int viewport_width, int viewport_height) void GLSLShader::render(GLuint &orig, int width, int height, int viewport_width, int viewport_height, int viewport_x, int viewport_y)
{ {
frame_count++; frame_count++;
@ -557,6 +557,8 @@ void GLSLShader::render(GLuint &orig, int width, int height, int viewport_width,
*/ */
for (unsigned int i = 1; i < pass.size(); i++) for (unsigned int i = 1; i < pass.size(); i++)
{ {
bool lastpass = (i == pass.size() - 1);
switch (pass[i].scale_type_x) switch (pass[i].scale_type_x)
{ {
case GLSL_ABSOLUTE: case GLSL_ABSOLUTE:
@ -631,14 +633,20 @@ void GLSLShader::render(GLuint &orig, int width, int height, int viewport_width,
0); 0);
// set up input texture (output of previous pass) and apply filter settings // set up input texture (output of previous pass) and apply filter settings
GLuint filter = (pass[i].filter == GLSL_UNDEFINED) ?
(lastpass ?
(gui_config->bilinear_filter ? GL_LINEAR : GL_NEAREST) : GL_NEAREST
) : pass[i].filter;
glBindTexture(GL_TEXTURE_2D, pass[i - 1].texture); glBindTexture(GL_TEXTURE_2D, pass[i - 1].texture);
glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) pass[i - 1].width); glPixelStorei(GL_UNPACK_ROW_LENGTH, (GLint) pass[i - 1].width);
glTexParameteri(GL_TEXTURE_2D, glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MAG_FILTER,
pass[i].filter == GLSL_UNDEFINED ? GL_NEAREST : pass[i].filter); filter);
glTexParameteri(GL_TEXTURE_2D, glTexParameteri(GL_TEXTURE_2D,
GL_TEXTURE_MIN_FILTER, GL_TEXTURE_MIN_FILTER,
pass[i].filter == GLSL_UNDEFINED ? GL_NEAREST : pass[i].filter); filter);
glTexCoordPointer(2, GL_FLOAT, 0, tex_coords); glTexCoordPointer(2, GL_FLOAT, 0, tex_coords);

2
gtk/src/shaders/glsl.h
View File

@ -106,7 +106,7 @@ typedef struct
{ {
bool load_shader (char *filename); bool load_shader (char *filename);
bool load_shader_file (char *filename); bool load_shader_file (char *filename);
void render (GLuint &orig, int width, int height, int viewport_width, int viewport_height); void render (GLuint &orig, int width, int height, int viewport_width, int viewport_height, int viewport_x, int viewport_y);
void set_shader_vars (int pass); void set_shader_vars (int pass);
void clear_shader_vars (void); void clear_shader_vars (void);
void strip_parameter_pragmas(char *buffer); void strip_parameter_pragmas(char *buffer);