From b9cd3996c7a67687b0a1fe5066c92e43a820de1e Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Wed, 16 Sep 2015 18:23:20 -0600 Subject: [PATCH] PP: Restore a line of code deleted by commit bb63bd5e3792455b77ce93e471158bed0cc884f0. --- glslang/Include/revision.h | 2 +- glslang/MachineIndependent/preprocessor/Pp.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 570012a2..c75c6ba3 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "3.0.769" +#define GLSLANG_REVISION "3.0.770" #define GLSLANG_DATE "16-Sep-2015" diff --git a/glslang/MachineIndependent/preprocessor/Pp.cpp b/glslang/MachineIndependent/preprocessor/Pp.cpp index 63dede79..406767ae 100644 --- a/glslang/MachineIndependent/preprocessor/Pp.cpp +++ b/glslang/MachineIndependent/preprocessor/Pp.cpp @@ -1011,6 +1011,7 @@ int TPpContext::MacroExpand(int atom, TPpToken* ppToken, bool expandUndef, bool case PpAtomFileMacro: { if (parseContext.getCurrentLoc().name) parseContext.ppRequireExtensions(ppToken->loc, 1, &E_GL_GOOGLE_cpp_style_line_directive, "filename-based __FILE__"); + ppToken->ival = parseContext.getCurrentLoc().string; sprintf(ppToken->name, "%s", ppToken->loc.getStringNameOrNum().c_str()); UngetToken(PpAtomConstInt, ppToken); return 1;