CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-02 17:53:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Seems to work :) Yay!

Browse Source
This commit is contained in:
Themaister 2011-05-22 17:36:18 +02:00
parent 373b9dcc37
commit 3f58932c2b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/shader_cg.c
View File

@ -140,7 +140,7 @@ static bool load_plain(const char *path)
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
if (prg[i].fprg == NULL || prg[i].vprg == NULL) if (!prg[i].fprg || !prg[i].vprg)
{ {
CGerror err = cgGetError(); CGerror err = cgGetError();
SSNES_ERR("CG error: %s\n", cgGetErrorString(err)); SSNES_ERR("CG error: %s\n", cgGetErrorString(err));
@ -304,11 +304,15 @@ static bool load_preset(const char *path)
} }
} }
// Basedir.
char dir_path[256]; char dir_path[256];
strlcpy(dir_path, path, sizeof(dir_path)); strlcpy(dir_path, path, sizeof(dir_path));
char *ptr = strrchr(dir_path, '/'); char *ptr = strrchr(dir_path, '/');
if (!ptr) ptr = strrchr(dir_path, '\\'); if (!ptr) ptr = strrchr(dir_path, '\\');
if (ptr) ptr[1] = '\0'; if (ptr)
ptr[1] = '\0';
else // No directory.
dir_path[0] = '\0';
// Finally load shaders :) // Finally load shaders :)
for (unsigned i = 0; i < shaders; i++) for (unsigned i = 0; i < shaders; i++)
@ -321,7 +325,6 @@ static bool load_preset(const char *path)
if (config_get_string(conf, attr_buf, &shader_path)) if (config_get_string(conf, attr_buf, &shader_path))
{ {
strlcpy(path_buf, dir_path, sizeof(path_buf)); strlcpy(path_buf, dir_path, sizeof(path_buf));
strlcat(path_buf, "/", sizeof(path_buf));
strlcat(path_buf, shader_path, sizeof(path_buf)); strlcat(path_buf, shader_path, sizeof(path_buf));
free(shader_path); free(shader_path);
} }
@ -377,6 +380,8 @@ bool gl_cg_init(const char *path)
} }
cgGLSetOptimalOptions(cgFProf); cgGLSetOptimalOptions(cgFProf);
cgGLSetOptimalOptions(cgVProf); cgGLSetOptimalOptions(cgVProf);
cgGLEnableProfile(cgFProf);
cgGLEnableProfile(cgVProf);
if (strstr(path, ".cgp")) if (strstr(path, ".cgp"))
{ {
@ -389,10 +394,7 @@ bool gl_cg_init(const char *path)
return false; return false;
} }
cgGLEnableProfile(cgFProf); for (unsigned i = 1; i < cg_shader_num + 1; i++)
cgGLEnableProfile(cgVProf);
for (unsigned i = 0; i < cg_shader_num; i++)
{ {
cgGLBindProgram(prg[i].fprg); cgGLBindProgram(prg[i].fprg);
cgGLBindProgram(prg[i].vprg); cgGLBindProgram(prg[i].vprg);