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

Sizes were backwards. 

GTK+: Fix .slangp custom extension.
This commit is contained in:
Brandon Wright 2019-01-25 17:54:55 -06:00
parent a3065c10b0
commit 61f5141bcc
2 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/src/gtk_shader_parameters.cpp
View File

@ -63,7 +63,11 @@ static void dialog_response (GtkDialog *pdialog, gint response_id, gpointer user
case GTK_RESPONSE_OK:
{
char path[PATH_MAX];
std::string config_file = get_config_dir() + "/snes9x.glslp";
std::string config_file = get_config_dir();
if (gui_config->shader_filename.find(".slangp") != std::string::npos)
config_file += "/snes9x.slangp";
else
config_file = get_config_dir() + "/snes9x.glslp";
S9xDisplayGetDriver ()->save (config_file.c_str ());
realpath (config_file.c_str (), path);
gui_config->shader_filename = path;

45
shaders/slang.cpp
View File

@ -40,6 +40,45 @@ std::string GLSLShader::slang_get_stage(std::vector<std::string> &lines,
return output.str();
}
static void printuniforms(std::vector<SlangUniform> &unif)
{
for (int i = 0; i < (int)unif.size(); i++)
{
SlangUniform &u = unif[i];
printf("Uniform %d: ", i);
switch (u.type)
{
case SL_PREVIOUSFRAMETEXTURE:
printf("OriginalHistory%d\n", u.num);
break;
case SL_PASSTEXTURE:
printf("Pass%d\n", u.num);
break;
case SL_LUTTEXTURE:
printf("User%d\n", u.num);
break;
case SL_PREVIOUSFRAMESIZE:
printf("OriginalHistorySize%d\n", u.num);
break;
case SL_PASSSIZE:
printf("PassSize%d\n", u.num);
break;
case SL_LUTSIZE:
printf("UserSize%d\n", u.num);
break;
case SL_MVP:
printf("MVP\n");
break;
case SL_FRAMECOUNT:
printf("FrameCount\n");
break;
case SL_PARAM:
printf("Parameter %d\n", u.num);
break;
}
}
}
static GLuint string_to_format(char *format)
{
#define MATCH(s, f) \
@ -385,10 +424,10 @@ void GLSLShader::slang_introspect()
if (name.find(needle) == 0)
{
std::string tmp = name.substr(needle.length());
if (tmp.rfind("Size") == tmp.length() - 4)
if (tmp.find("Size") == 0)
{
u.type = type + 1;
tmp = tmp.substr(0, tmp.length() - 4);
tmp = tmp.substr(4);
}
else
u.type = type;
@ -634,6 +673,8 @@ void GLSLShader::slang_set_shader_vars(int p)
}
else if (u.type == SL_PREVIOUSFRAMESIZE)
{
if (u.num < 1)
u.num = 0;
size[0] = (GLfloat)prev_frame[u.num - 1].width;
size[1] = (GLfloat)prev_frame[u.num - 1].height;
size[2] = (GLfloat)1.0f / prev_frame[u.num - 1].width;