Changeset 69627 in webkit

Timestamp:

Oct 12, 2010 6:23:39 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-12 Alok priyadarshi <​alokp@chromium.org>

Reviewed by Kenneth Russell.

Remove support for ANGLE SH_VERSION <= 100
​https://bugs.webkit.org/show_bug.cgi?id=47307

• src/WebGraphicsContext3DDefaultImpl.cpp: (WebKit::WebGraphicsContext3DDefaultImpl::angleCreateCompilers): (WebKit::WebGraphicsContext3DDefaultImpl::angleValidateShaderSource):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebGraphicsContext3DDefaultImpl.cpp (modified) (3 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-10-12  Alok priyadarshi  <alokp@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Remove support for ANGLE SH_VERSION <= 100
+        https://bugs.webkit.org/show_bug.cgi?id=47307
+
+        * src/WebGraphicsContext3DDefaultImpl.cpp:
+        (WebKit::WebGraphicsContext3DDefaultImpl::angleCreateCompilers):
+        (WebKit::WebGraphicsContext3DDefaultImpl::angleValidateShaderSource):
+
 2010-10-12  James Robinson  <jamesr@chromium.org>
 

trunk/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp

@@ -1479 +1479 @@
         return false;
 
-#if defined(SH_VERSION) && (SH_VERSION > 100)
     ShBuiltInResources resources;
     ShInitBuiltInResources(&resources);
-#else
-    TBuiltInResource resources;
-    ShInitBuiltInResource(&resources);
-#endif // SH_VERSION
     getIntegerv(GL_MAX_VERTEX_ATTRIBS, &resources.MaxVertexAttribs);
     getIntegerv(MAX_VERTEX_UNIFORM_VECTORS, &resources.MaxVertexUniformVectors);
@@ -1496 +1491 @@
     resources.MaxDrawBuffers = 1;
 
-#if defined(SH_VERSION) && (SH_VERSION > 100)
     m_fragmentCompiler = ShConstructCompiler(SH_FRAGMENT_SHADER, SH_WEBGL_SPEC, &resources);
     m_vertexCompiler = ShConstructCompiler(SH_VERTEX_SHADER, SH_WEBGL_SPEC, &resources);
-#else
-    m_fragmentCompiler = ShConstructCompiler(EShLangFragment, EShSpecWebGL, &resources);
-    m_vertexCompiler = ShConstructCompiler(EShLangVertex, EShSpecWebGL, &resources);
-#endif // SH_VERSION
     return (m_fragmentCompiler && m_vertexCompiler);
 }
@@ -1542 +1532 @@
         return false;
 
-#if defined(SH_VERSION) && (SH_VERSION > 100)
     if (!ShCompile(compiler, &entry.source, 1, SH_OBJECT_CODE)) {
-#else
-    if (!ShCompile(compiler, &entry.source, 1, EShOptObjectCode)) {
-#endif // SH_VERSION
         int logSize = 0;
         ShGetInfo(compiler, SH_INFO_LOG_LENGTH, &logSize);