zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-25 13:31:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Improve the "#line 1" directive insertion so that errors in all the shaders use line numbers relative to the lump they are referring to

Browse source
This commit is contained in:
Magnus Norddahl 2018-02-10 14:46:43 +01:00
parent 5528d4157b
commit e2cab652d0
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gl/shaders/gl_shader.cpp
View file

@ -249,8 +249,6 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
i_data += "#define brighttexture texture2\n"; i_data += "#define brighttexture texture2\n";
i_data += "#endif\n"; i_data += "#endif\n";
i_data += "#line 1\n";
int vp_lump = Wads.CheckNumForFullName(vert_prog_lump, 0); int vp_lump = Wads.CheckNumForFullName(vert_prog_lump, 0);
if (vp_lump == -1) I_Error("Unable to load '%s'", vert_prog_lump); if (vp_lump == -1) I_Error("Unable to load '%s'", vert_prog_lump);
FMemLump vp_data = Wads.ReadLump(vp_lump); FMemLump vp_data = Wads.ReadLump(vp_lump);
@ -307,11 +305,16 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
vp_comb << defines << i_data.GetChars(); vp_comb << defines << i_data.GetChars();
FString fp_comb = vp_comb; FString fp_comb = vp_comb;
vp_comb << "#line 1\n";
fp_comb << "#line 1\n";
vp_comb << vp_data.GetString().GetChars() << "\n"; vp_comb << vp_data.GetString().GetChars() << "\n";
fp_comb << fp_data.GetString().GetChars() << "\n"; fp_comb << fp_data.GetString().GetChars() << "\n";
if (proc_prog_lump != NULL) if (proc_prog_lump != NULL)
{ {
fp_comb << "#line 1\n";
if (*proc_prog_lump != '#') if (*proc_prog_lump != '#')
{ {
int pp_lump = Wads.CheckNumForFullName(proc_prog_lump); int pp_lump = Wads.CheckNumForFullName(proc_prog_lump);