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

Merge branch 'master' of github.com:Themaister/SSNES

This commit is contained in:
TwinAphex51224 2012-02-13 22:25:46 +01:00
parent d77560f1ea bb642d3010
commit 55a400f521
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/shader_cg.c
View File

@ -766,7 +766,7 @@ static bool load_shader_params(unsigned i, config_file_t *conf)
} }
char attr_name_buf[64]; char attr_name_buf[64];
double fattr; float fattr;
int iattr; int iattr;
struct gl_fbo_scale *scale = &cg_scale[i + 1]; // Shader 0 is passthrough shader. Start at 1. struct gl_fbo_scale *scale = &cg_scale[i + 1]; // Shader 0 is passthrough shader. Start at 1.
@ -819,12 +819,12 @@ static bool load_shader_params(unsigned i, config_file_t *conf)
else else
{ {
print_buf(attr_name_buf, "scale%u", i); print_buf(attr_name_buf, "scale%u", i);
if (config_get_double(conf, attr_name_buf, &fattr)) if (config_get_float(conf, attr_name_buf, &fattr))
scale->scale_x = fattr; scale->scale_x = fattr;
else else
{ {
print_buf(attr_name_buf, "scale_x%u", i); print_buf(attr_name_buf, "scale_x%u", i);
if (config_get_double(conf, attr_name_buf, &fattr)) if (config_get_float(conf, attr_name_buf, &fattr))
scale->scale_x = fattr; scale->scale_x = fattr;
} }
} }
@ -844,12 +844,12 @@ static bool load_shader_params(unsigned i, config_file_t *conf)
else else
{ {
print_buf(attr_name_buf, "scale%u", i); print_buf(attr_name_buf, "scale%u", i);
if (config_get_double(conf, attr_name_buf, &fattr)) if (config_get_float(conf, attr_name_buf, &fattr))
scale->scale_y = fattr; scale->scale_y = fattr;
else else
{ {
print_buf(attr_name_buf, "scale_y%u", i); print_buf(attr_name_buf, "scale_y%u", i);
if (config_get_double(conf, attr_name_buf, &fattr)) if (config_get_float(conf, attr_name_buf, &fattr))
scale->scale_y = fattr; scale->scale_y = fattr;
} }
} }