[webkit-changes] [119579] trunk/Source/WebCore

Wed, 06 Jun 2012 03:24:56 -0700

Title: [119579] trunk/Source/WebCore
Revision
119579
Author
[email protected]
Date
2012-06-06 03:24:47 -0700 (Wed, 06 Jun 2012)

Log Message

[Qt] Fix harmattan builds broken by r119247.
https://bugs.webkit.org/show_bug.cgi?id=88330

Patch by Michael Brüning <[email protected]> on 2012-06-06
Reviewed by Jocelyn Turcotte.

Fix Harmattan build break caused by undefined constant
GL_TEXTURE_RECTANGLE_ARB by adding defined(GL_ARB_texture_rectangle)
guards around TextureMapperGL::drawTextureRectangleARB.

* platform/graphics/texmap/TextureMapperGL.cpp: Added defined(GL_ARB_texture_rectangle) guards around drawTextureRectangleARB.
(WebCore):
* platform/graphics/texmap/TextureMapperGL.h: Added definded(GL_ARB_texture_rectangle) guards around drawTextureRectangleARB.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (119578 => 119579)


--- trunk/Source/WebCore/ChangeLog	2012-06-06 10:12:40 UTC (rev 119578)
+++ trunk/Source/WebCore/ChangeLog	2012-06-06 10:24:47 UTC (rev 119579)
@@ -1,3 +1,18 @@
+2012-06-06  Michael Brüning  <[email protected]>
+
+        [Qt] Fix harmattan builds broken by r119247.
+        https://bugs.webkit.org/show_bug.cgi?id=88330
+
+        Reviewed by Jocelyn Turcotte.
+
+        Fix Harmattan build break caused by undefined constant
+        GL_TEXTURE_RECTANGLE_ARB by adding defined(GL_ARB_texture_rectangle)
+        guards around TextureMapperGL::drawTextureRectangleARB.
+
+        * platform/graphics/texmap/TextureMapperGL.cpp: Added defined(GL_ARB_texture_rectangle) guards around drawTextureRectangleARB.
+        (WebCore):
+        * platform/graphics/texmap/TextureMapperGL.h: Added definded(GL_ARB_texture_rectangle) guards around drawTextureRectangleARB.
+
 2012-06-06  Shinya Kawanaka  <[email protected]>
 
         PositionIterator:;setOffsetInLeafNode() is not used anywhere.

Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (119578 => 119579)


--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp	2012-06-06 10:12:40 UTC (rev 119578)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp	2012-06-06 10:24:47 UTC (rev 119579)
@@ -370,6 +370,7 @@
     drawTexture(textureGL.id(), textureGL.isOpaque() ? 0 : SupportsBlending, textureGL.size(), targetRect, matrix, opacity, mask);
 }
 
+#if defined(GL_ARB_texture_rectangle)
 void TextureMapperGL::drawTextureRectangleARB(uint32_t texture, Flags flags, const IntSize& textureSize, const FloatRect& targetRect, const TransformationMatrix& modelViewMatrix, float opacity, const BitmapTexture* maskTexture)
 {
     RefPtr<TextureMapperShaderProgram> shaderInfo;
@@ -397,6 +398,7 @@
     bool needsBlending = (flags & SupportsBlending) || opacity < 0.99 || maskTexture;
     drawRect(targetRect, modelViewMatrix, shaderInfo.get(), GL_TRIANGLE_FAN, needsBlending);
 }
+#endif // defined(GL_ARB_texture_rectangle) 
 
 void TextureMapperGL::drawTexture(uint32_t texture, Flags flags, const IntSize& textureSize, const FloatRect& targetRect, const TransformationMatrix& modelViewMatrix, float opacity, const BitmapTexture* maskTexture)
 {

Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h (119578 => 119579)


--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h	2012-06-06 10:12:40 UTC (rev 119578)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.h	2012-06-06 10:24:47 UTC (rev 119579)
@@ -52,7 +52,9 @@
     virtual void drawBorder(const Color&, float borderWidth, const FloatRect& targetRect, const TransformationMatrix& modelViewMatrix = TransformationMatrix()) OVERRIDE;
     virtual void drawTexture(const BitmapTexture&, const FloatRect&, const TransformationMatrix&, float opacity, const BitmapTexture* maskTexture) OVERRIDE;
     virtual void drawTexture(uint32_t texture, Flags, const IntSize& textureSize, const FloatRect& targetRect, const TransformationMatrix& modelViewMatrix, float opacity, const BitmapTexture* maskTexture);
+#if defined(GL_ARB_texture_rectangle)
     virtual void drawTextureRectangleARB(uint32_t texture, Flags, const IntSize& textureSize, const FloatRect& targetRect, const TransformationMatrix& modelViewMatrix, float opacity, const BitmapTexture* maskTexture);
+#endif
     virtual void bindSurface(BitmapTexture* surface) OVERRIDE;
     virtual void beginClip(const TransformationMatrix&, const FloatRect&) OVERRIDE;
     virtual void beginPainting(PaintFlags = 0) OVERRIDE;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to