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

Shaders: Show errors on file load with name in "".

This commit is contained in:
Brandon Wright 2019-01-27 19:12:42 -06:00
parent 9523f10518
commit 5fc0271330
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shaders/glsl.cpp
View File

@ -364,7 +364,7 @@ bool GLSLShader::load_shader(char *filename)
if (lines.empty()) if (lines.empty())
{ {
printf("Couldn't read shader file %s\n", temp); printf("Couldn't read shader file \"%s\"\n", temp);
return false; return false;
} }
@ -379,7 +379,7 @@ bool GLSLShader::load_shader(char *filename)
retval = slang_compile(lines, "vertex"); retval = slang_compile(lines, "vertex");
if (retval < 0) if (retval < 0)
{ {
printf("Vertex shader in %s failed to compile.\n", p->filename); printf("Vertex shader in \"%s\" failed to compile.\n", p->filename);
return false; return false;
} }
vertex_shader = retval; vertex_shader = retval;
@ -387,7 +387,7 @@ bool GLSLShader::load_shader(char *filename)
retval = slang_compile(lines, "fragment"); retval = slang_compile(lines, "fragment");
if (retval < 0) if (retval < 0)
{ {
printf ("Fragment shader in %s failed to compile.\n", p->filename); printf ("Fragment shader in \"%s\" failed to compile.\n", p->filename);
return false; return false;
} }
fragment_shader = retval; fragment_shader = retval;
@ -401,7 +401,7 @@ bool GLSLShader::load_shader(char *filename)
GL_VERTEX_SHADER, GL_VERTEX_SHADER,
&vertex_shader) || !vertex_shader) &vertex_shader) || !vertex_shader)
{ {
printf("Couldn't compile vertex shader in %s.\n", p->filename); printf("Couldn't compile vertex shader in \"%s\".\n", p->filename);
return false; return false;
} }
@ -411,7 +411,7 @@ bool GLSLShader::load_shader(char *filename)
GL_FRAGMENT_SHADER, GL_FRAGMENT_SHADER,
&fragment_shader) || !fragment_shader) &fragment_shader) || !fragment_shader)
{ {
printf("Couldn't compile fragment shader in %s.\n", p->filename); printf("Couldn't compile fragment shader in \"%s\".\n", p->filename);
return false; return false;
} }
} }

3
shaders/shader_helpers.cpp
View File

@ -259,7 +259,10 @@ static char *read_file(const char *filename)
file = fopen(filename, "rb"); file = fopen(filename, "rb");
if (!file) if (!file)
{
printf ("File not found: \"%s\"\n", filename);
return NULL; return NULL;
}
fseek(file, 0, SEEK_END); fseek(file, 0, SEEK_END);
size = ftell(file); size = ftell(file);