Changeset 57267 in webkit

Timestamp:

Apr 8, 2010 2:23:00 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-08 Jarkko Sakkinen <​jarkko.sakkinen@tieto.com>

Reviewed by Simon Hausmann.

[Qt] Remove shaderSource manipulation from GraphicsContext3DQt.cpp
​https://bugs.webkit.org/show_bug.cgi?id=37226

• platform/graphics/qt/GraphicsContext3DQt.cpp: (WebCore::GraphicsContext3D::shaderSource):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsContext3DQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-08  Jarkko Sakkinen  <jarkko.sakkinen@tieto.com>
+
+        Reviewed by Simon Hausmann.
+
+         [Qt] Remove shaderSource manipulation from GraphicsContext3DQt.cpp
+         https://bugs.webkit.org/show_bug.cgi?id=37226
+
+        * platform/graphics/qt/GraphicsContext3DQt.cpp:
+        (WebCore::GraphicsContext3D::shaderSource):
+
 2010-04-08  Chris Evans  <cevans@chromium.org>
 

trunk/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

@@ -1031 +1031 @@
 }
 
-void GraphicsContext3D::shaderSource(WebGLShader* shader, const String& string)
+void GraphicsContext3D::shaderSource(WebGLShader* shader, const String& source)
 {
     ASSERT(shader);
@@ -1037 +1037 @@
     m_internal->m_glWidget->makeCurrent();
 
-    // Force the use of GLSL 1.0:
-    // https://cvs.khronos.org/svn/repos/registry/trunk/public/webgl/doc/spec/WebGL-spec.html#4.4
-    // FIXME: Lines beginning with "#version" should be stripped out.
-
-    String prepared;
-   
-    prepared.append("#version 100\n");
-#if defined(QT_OPENGL_ES_2)
-    prepared.append("precision mediump float;\n");
-#endif
-    prepared.append(string);
-
-    CString preparedCS = prepared.utf8();
-    const char* data = preparedCS.data();
-    int length = prepared.length();
+    CString sourceCS = source.utf8();
+    const char* data = sourceCS.data();
+    int length = source.length();
     m_internal->shaderSource((GLuint) shader->object(), /* count */ 1, &data, &length);
 }