Changeset 69139 in webkit

Timestamp:

Oct 5, 2010 1:17:19 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-05 Alok Priyadarshi <​alokp@chromium.org>

Reviewed by Kenneth Russell.

Supported ANGLE SH_VERSION > 100
​https://bugs.webkit.org/show_bug.cgi?id=47024

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

Location:

trunk/WebKit/chromium

Files:

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

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-10-05  Alok Priyadarshi  <alokp@chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        Supported ANGLE SH_VERSION > 100
+        https://bugs.webkit.org/show_bug.cgi?id=47024
+
+        * src/WebGraphicsContext3DDefaultImpl.cpp:
+        (WebKit::WebGraphicsContext3DDefaultImpl::angleCreateCompilers):
+        (WebKit::WebGraphicsContext3DDefaultImpl::angleValidateShaderSource):
+
 2010-10-04  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp

@@ -1415 +1415 @@
         return false;
 
-    TBuiltInResource resource;
-    resource.MaxVertexAttribs = 0;
-    getIntegerv(GL_MAX_VERTEX_ATTRIBS, &resource.MaxVertexAttribs);
-    resource.MaxVertexUniformVectors = 0;
-    getIntegerv(MAX_VERTEX_UNIFORM_VECTORS,
-                &resource.MaxVertexUniformVectors);
-    resource.MaxVaryingVectors = 0;
-    getIntegerv(MAX_VARYING_VECTORS,
-                &resource.MaxVaryingVectors);
-    resource.MaxVertexTextureImageUnits = 0;
-    getIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &resource.MaxVertexTextureImageUnits);
-    resource.MaxCombinedTextureImageUnits = 0;
-    getIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &resource.MaxCombinedTextureImageUnits);
-    resource.MaxTextureImageUnits = 0;
-    getIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &resource.MaxTextureImageUnits);
-    resource.MaxFragmentUniformVectors = 0;
-    getIntegerv(MAX_FRAGMENT_UNIFORM_VECTORS,
-                &resource.MaxFragmentUniformVectors);
+#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);
+    getIntegerv(MAX_VARYING_VECTORS, &resources.MaxVaryingVectors);
+    getIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &resources.MaxVertexTextureImageUnits);
+    getIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &resources.MaxCombinedTextureImageUnits);
+    getIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &resources.MaxTextureImageUnits);
+    getIntegerv(MAX_FRAGMENT_UNIFORM_VECTORS, &resources.MaxFragmentUniformVectors);
     // Always set to 1 for OpenGL ES.
-    resource.MaxDrawBuffers = 1;
-
-    m_fragmentCompiler = ShConstructCompiler(EShLangFragment, EShSpecWebGL, &resource);
-    m_vertexCompiler = ShConstructCompiler(EShLangVertex, EShSpecWebGL, &resource);
+    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);
 }
@@ -1477 +1478 @@
         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);