Support line-continuation character in WebGL 2.0

third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 430 matching lines @@
 
     case InPreprocessorDirective:
         // No matter what the character is, just pass it
         // through. Do not parse comments in this state. This
         // might not be the right thing to do long term, but it
         // should handle the #error preprocessor directive.
         emit(c);
         break;
 
     case InSingleLineComment:
+        // Handle line-continuation character in single line comment.
+        // Advance string to next nonspace character and eat it.

[Zhenyao Mo, 2016/06/29 18:16:07]

Can you also add a comment, saying that line-continuation characters are
processed before comment processing?

[Ken Russell (switch to Gerrit), 2016/06/30 00:04:31]

This change doesn't seem to implement the behavior of the line continuation
character in the GLSL ES 3.00.4 spec. No special handling should be needed
inside a single-line comment. Per Section 3.1 "Character Set", the line
continuation character only has that effect when immediately preceding a
newline.

[qiankun, 2016/06/30 15:12:47]

Done.

+        if (c == '\\') {
+            while (peek(temp) && WTF::isASCIISpace(temp))
+                advance();
+            advance();
+        }
+
         // The newline code at the top of this function takes care
         // of resetting our state when we get out of the
         // single-line comment. Swallow all other characters.
         break;
 
     case InMultiLineComment:
         if (c == '*' && peek(temp) && temp == '/') {
             emit('*');
             emit('/');
             m_parseState = MiddleOfLine;
@@ skipping 4993 matching lines @@
     if (x < 0 || y < 0 || z < 0) {
         synthesizeGLError(GL_INVALID_VALUE, functionName, "size < 0");
         return false;
     }
     return true;
 }
 
 bool WebGLRenderingContextBase::validateString(const char* functionName, const String& string)
 {
     for (size_t i = 0; i < string.length(); ++i) {
+        // line-continuation character \ is supported in WebGL 2.0.
+        if (isWebGL2OrHigher() && string[i] == '\\')

[qiankun, 2016/06/29 05:31:21]

This isn't very accurate to say WebGL 2.0 here. WebGL 2.0 + GLSL ES 1.00 doesn't
support line-continuation, while WebGL 2.0 + GLSL ES 3.00 supports
line-continuation. So, it should check shader version. But no shader version
detecting in Blink side. Here we assume ANGLE or driver will do the final
validation.

Another problem is that ANGLE may change shader version according which GL
context is used, see GetShaderOutputLanguageForContext
(https://cs.chromium.org/chromium/src/gpu/command_buffer/service/shader_transl...).
Different visions of GLSL may have different supports on line-continuation. For
example, it's supported in GLSL ES 3.00.4, but it's not supported in GLSL
3.30.6.

[Zhenyao Mo, 2016/06/29 18:16:07]

This is not true.  See GLSL ES Spec 3.00.4 page 6, "Support of line continuation
and support of UTF-8 characters within comments is optional in GLSL ES 1.00 when
used with the OpenGL ES 2.0 API. However, support is mandated for both of these
when a GLSL ES 1.00 shader is used with the OpenGL ES 3.0 API."

Also, can you pass a WebGL version to validateCharacter() so we can handle the
behavior inside that function?
I am not sure we will support WebGL 2 on top of GLSL 3.30

[Ken Russell (switch to Gerrit), 2016/06/30 00:04:31]

This particular change (to validateString) seems wrong. This method takes in the
names of things like attribute and uniform locations. These should never contain
the line continuation character.

+            continue;
         if (!validateCharacter(string[i])) {
             synthesizeGLError(GL_INVALID_VALUE, functionName, "string not ASCII");
             return false;
         }
     }
     return true;
 }
 
 bool WebGLRenderingContextBase::validateTexFuncFormatAndType(const char* functionName, TexImageFunctionType functionType, GLenum internalformat, GLenum format, GLenum type, GLint level)
 {
@@ skipping 970 matching lines @@
         contextGL()->PixelStorei(GL_UNPACK_ALIGNMENT, 1);
 }
 
 void WebGLRenderingContextBase::restoreUnpackParameters()
 {
     if (m_unpackAlignment != 1)
         contextGL()->PixelStorei(GL_UNPACK_ALIGNMENT, m_unpackAlignment);
 }
 
 } // namespace blink