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

Support parameters.

This commit is contained in:
Brandon Wright 2018-05-11 17:08:13 -05:00
parent 3b01b57162
commit e76aac89f2
2 changed files with 72 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,6 @@ static int wrap_mode_string_to_enum(const char *string)
bool GLSLShader::load_shader_file (char *filename)
{
ConfigFile conf;
char key[256];
if (strlen(filename) < 6 || strcasecmp(&filename[strlen(filename) - 6], ".glslp"))
@ -224,7 +223,7 @@ bool GLSLShader::load_shader_file (char *filename)
return true;
}
static void strip_parameter_pragmas(char *buffer)
void GLSLShader::strip_parameter_pragmas(char *buffer)
{
/* #pragma parameter lines tend to have " characters in them,
* which is not legal GLSL. */
@ -232,19 +231,32 @@ static void strip_parameter_pragmas(char *buffer)
while (s)
{
/* #pragmas have to be on a single line,
* so we can just replace the entire line with spaces. */
while (*s != '\0' && *s != '\n')
*s++ = ' ';
s = strstr(s, "#pragma parameter");
GLSLParam par;
unsigned int i;
sscanf (s, "#pragma parameter %s \"%[^\"]\" %f %f %f %f",
par.id, par.name, &par.val, &par.min, &par.max, &par.step);
for (i = 0; i < param.size(); i++)
{
if (!strcmp(param[i].id, par.id))
break;
}
if (i >= param.size())
param.push_back (par);
/* blank out the line */
while (*s != '\0' && *s != '\n')
*s++ = ' ';
s = strstr(s, "#pragma parameter");
}
}
static GLuint compile_shader (char *program,
const char *aliases,
const char *defines,
GLuint type,
GLuint *out)
GLuint GLSLShader::compile_shader(char *program,
const char *aliases,
const char *defines,
GLuint type,
GLuint *out)
{
char info_log[1024];
char *ptr = program;
@ -325,8 +337,9 @@ bool GLSLShader::load_shader (char *filename)
GLuint vertex_shader = 0, fragment_shader = 0;
realpath(p->filename, temp);
strcpy (p->filename, temp);
char *contents = read_file (temp);
char *contents = read_file (p->filename);
if (!contents)
{
printf("Couldn't read shader file %s\n", temp);
@ -336,7 +349,7 @@ bool GLSLShader::load_shader (char *filename)
strip_parameter_pragmas(contents);
if (!compile_shader (contents,
"#define VERTEX\n",// #define PARAMETER_UNIFORM\n",
"#define VERTEX\n#define PARAMETER_UNIFORM\n",
aliases.c_str(),
GL_VERTEX_SHADER,
&vertex_shader) || !vertex_shader)
@ -346,7 +359,7 @@ bool GLSLShader::load_shader (char *filename)
}
if (!compile_shader (contents,
"#define FRAGMENT\n", // #define PARAMETER_UNIFORM\n",
"#define FRAGMENT\n#define PARAMETER_UNIFORM\n",
aliases.c_str(),
GL_FRAGMENT_SHADER,
&fragment_shader) || !fragment_shader)
@ -459,6 +472,20 @@ bool GLSLShader::load_shader (char *filename)
glGenerateMipmap (GL_TEXTURE_2D);
}
/* Check for parameters specified in file */
for (unsigned int i = 0; i < param.size(); i++)
{
char key[266];
const char *value;
snprintf (key, 266, "::%s", param[i].id);
value = conf.GetString (key, NULL);
if (value)
{
param[i].val = atof (value);
param[i].val = CLAMP (param[i].val, param[i].min, param[i].max);
}
}
glActiveTexture(GL_TEXTURE1);
glEnable(GL_TEXTURE_COORD_ARRAY);
glTexCoordPointer(2, GL_FLOAT, 0, lut_coords);
@ -731,6 +758,11 @@ void GLSLShader::register_uniforms ()
{
u->Lut[j] = glGetUniformLocation (program, lut[j].id);
}
for (unsigned int j = 0; j < param.size(); j++)
{
param[j].unif[i] = glGetUniformLocation (program, param[j].id);
}
}
glUseProgram (0);
@ -850,6 +882,12 @@ void GLSLShader::set_shader_vars (int p)
setTexCoords (u->PassPrev[p - i].TexCoord);
}
/* Parameters */
for (unsigned int i = 0; i < param.size(); i++)
{
setUniform1f (param[i].unif[p], param[i].val);
}
glActiveTexture (GL_TEXTURE0);
glBindBuffer (GL_ARRAY_BUFFER, 0);
}
@ -877,6 +915,7 @@ void GLSLShader::destroy (void)
glDeleteTextures (1, &prev_frame[i].texture);
}
param.clear();
pass.clear();
lut.clear();
prev_frame.clear();

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

@ -2,6 +2,9 @@
#include <deque>
#include <limits.h>
#include <epoxy/gl.h>
#include "../../conffile.h"
static const unsigned int glsl_max_passes = 20;
enum GLSLScaleType
{
@ -47,8 +50,8 @@ typedef struct
unsigned int max_pass;
unsigned int max_prevpass;
GLSLUniformMetrics Prev[7];
GLSLUniformMetrics Pass[20];
GLSLUniformMetrics PassPrev[20];
GLSLUniformMetrics Pass[glsl_max_passes];
GLSLUniformMetrics PassPrev[glsl_max_passes];
GLint Lut[9];
} GLSLUniforms;
@ -80,7 +83,7 @@ typedef struct
typedef struct
{
char id[PATH_MAX];
char id[256];
char filename[PATH_MAX];
GLuint filter;
GLuint texture;
@ -91,10 +94,12 @@ typedef struct
typedef struct
{
char name[PATH_MAX];
char id[256];
float min;
float max;
float def;
float val;
float step;
GLint unif[glsl_max_passes];
} GLSLParam;
typedef struct
@ -104,9 +109,18 @@ typedef struct
void render (GLuint &orig, int width, int height, int viewport_width, int viewport_height);
void set_shader_vars (int pass);
void clear_shader_vars (void);
void strip_parameter_pragmas(char *buffer);
GLuint compile_shader (char *program,
const char *aliases,
const char *defines,
GLuint type,
GLuint *out);
void destroy (void);
void register_uniforms (void);
ConfigFile conf;
std::vector<GLSLPass> pass;
std::vector<GLSLLut> lut;
std::vector<GLSLParam> param;