mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-17 15:03:25 +09:00
[Fix] (ShaderTranspiler): stop blanking block comments in the source handed to glslang
- BlankBlockComments replaced comment chars with spaces but preserved interior newlines, so a block comment spanning a newline inside a #define truncated the macro body (VALUE became empty) - glslang has a conformant preprocessor and collapses a block comment to one space across newlines, so the delivered source now keeps comments intact and lets glslang handle them - Fixes KHR-GL3x.shaders.preprocessor multiline_comment_define / redefine_object_multiline_comment / function_redefinition_3 (6 cases, both devices) - FilterUnsupportedGpuShaderInt64 relied on the blanking to skip commented-out #extension lines; it now masks comments locally (MaskCommentsAndQuotedText) like the sibling passes, collecting edits and applying them back-to-front - conditional_inclusion.basic_2 (defined() via macro expansion) stays failing by design: glslang rejects it as UB and working around it would mean re-running preprocessing MobileGL defers to glslang
This commit is contained in:
@@ -238,6 +238,77 @@ void main() {
|
||||
}
|
||||
}
|
||||
|
||||
// KHR-GL33.shaders.preprocessor.* — a block comment is one preprocessing token that the C/GLSL
|
||||
// preprocessor replaces with a single space, even when it spans newlines inside a directive. glslang
|
||||
// handles this natively, so MobileGL must not mangle it. These reproduce the CTS cases that failed
|
||||
// because comment blanking preserved the interior newline, truncating multi-line #define bodies.
|
||||
static void ExpectCompiles(MobileGL::ShaderStage stage, GLenum glStage, MobileGL::String source) {
|
||||
using namespace MG_Util::ShaderTranspiler;
|
||||
PreprocessShaderSource(stage, source);
|
||||
ShaderAttrib attrib{.shaderType = glStage, .sourceStr = source};
|
||||
auto res = ShaderCompiler::CompileShader(attrib);
|
||||
if (!res) {
|
||||
FAIL() << "errc: " << res.error().errc << "\nlog: " << res.error().log << "\nsource:\n" << source;
|
||||
}
|
||||
}
|
||||
|
||||
TEST_F(ProgramUtilTest, PreprocessMultilineCommentInDefineBodyCompiles) {
|
||||
ExpectCompiles(ShaderStage::Fragment, GL_FRAGMENT_SHADER,
|
||||
R"(#version 330
|
||||
precision mediump float;
|
||||
out float out0;
|
||||
#define VALUE /* current
|
||||
value */ 4.2
|
||||
|
||||
void main()
|
||||
{
|
||||
out0 = VALUE;
|
||||
})");
|
||||
}
|
||||
|
||||
TEST_F(ProgramUtilTest, PreprocessRedefineObjectMultilineCommentCompiles) {
|
||||
ExpectCompiles(ShaderStage::Fragment, GL_FRAGMENT_SHADER,
|
||||
R"(#version 330
|
||||
precision mediump float;
|
||||
out float out0;
|
||||
# define VAL1 1.0
|
||||
#define VAL2 2.0
|
||||
|
||||
#define RES2 /* fdsjklfdsjkl
|
||||
dsfjkhfdsjkh
|
||||
fdsjklhfdsjkh */ (RES1 * VAL2)
|
||||
#define RES1 (VAL2 / VAL1)
|
||||
#define RES2 /* ewrlkjhsadf */ (RES1 * VAL2)
|
||||
#define VALUE (RES2 + RES1)
|
||||
|
||||
void main()
|
||||
{
|
||||
out0 = VALUE;
|
||||
})");
|
||||
}
|
||||
|
||||
TEST_F(ProgramUtilTest, PreprocessFunctionMacroRedefinitionMultilineCommentCompiles) {
|
||||
ExpectCompiles(ShaderStage::Fragment, GL_FRAGMENT_SHADER,
|
||||
R"(#version 330
|
||||
precision mediump float;
|
||||
out float out0;
|
||||
# define FUNC(a,b) (a +b)
|
||||
# define FUNC(a,b)(a /* comment
|
||||
*/ +b)
|
||||
|
||||
void main()
|
||||
{
|
||||
out0 = FUNC(1.0, 2.0);
|
||||
})");
|
||||
}
|
||||
|
||||
// Note: KHR-GL3x.shaders.preprocessor.conditional_inclusion.basic_2 (`#define AAA defined(BBB)` used
|
||||
// in `#if !AAA`) is intentionally NOT handled here. Generating the `defined` operator via macro
|
||||
// expansion is undefined per the C/GLSL preprocessor spec, and glslang deliberately rejects it
|
||||
// ("'defined' : cannot use in preprocessor expression when expanded from macros"). Making it pass
|
||||
// would require MobileGL to run its own macro expansion ahead of glslang, which is exactly the
|
||||
// preprocessing we defer to glslang; the two cases stay failing by design.
|
||||
|
||||
TEST_F(ProgramUtilTest, PreprocessLegacyFragmentShaderModernizesGlmarkStyleSource) {
|
||||
using namespace MG_Util::ShaderTranspiler;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user