ubergames
/
lilium-voyager
mirror of https://github.com/UberGames/lilium-voyager.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve warning for shader missing opening brace

This commit is contained in:
Zack Middleton 2013-06-02 21:59:01 -05:00
parent 3ec2b02dce
commit d4f785c465
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/renderergl1/tr_shader.c
View File

@ -2961,7 +2961,13 @@ static void ScanAndLoadShaderFiles( void )
token = COM_ParseExt(&p, qtrue); token = COM_ParseExt(&p, qtrue);
if(token[0] != '{' || token[1] != '\0') if(token[0] != '{' || token[1] != '\0')
{ {
ri.Printf(PRINT_WARNING, "WARNING: Bad shader file %s has incorrect syntax.\n", filename); ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing opening brace",
filename, shaderName, shaderLine);
if (token[0])
{
ri.Printf(PRINT_WARNING, " (found \"%s\" on line %d)", token, COM_GetCurrentParseLine());
}
ri.Printf(PRINT_WARNING, ".\n");
ri.FS_FreeFile(buffers[i]); ri.FS_FreeFile(buffers[i]);
buffers[i] = NULL; buffers[i] = NULL;
break; break;

8
code/renderergl2/tr_shader.c
View File

@ -3601,7 +3601,13 @@ static void ScanAndLoadShaderFiles( void )
token = COM_ParseExt(&p, qtrue); token = COM_ParseExt(&p, qtrue);
if(token[0] != '{' || token[1] != '\0') if(token[0] != '{' || token[1] != '\0')
{ {
ri.Printf(PRINT_WARNING, "WARNING: Bad shader file %s has incorrect syntax.\n", filename); ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing opening brace",
filename, shaderName, shaderLine);
if (token[0])
{
ri.Printf(PRINT_WARNING, " (found \"%s\" on line %d)", token, COM_GetCurrentParseLine());
}
ri.Printf(PRINT_WARNING, ".\n");
ri.FS_FreeFile(buffers[i]); ri.FS_FreeFile(buffers[i]);
buffers[i] = NULL; buffers[i] = NULL;
break; break;