Title: [137901] trunk/Source/WebCore
- Revision
- 137901
- Author
- zeno.albis...@digia.com
- Date
- 2012-12-17 06:01:37 -0800 (Mon, 17 Dec 2012)
Log Message
[Texmap] Drawing of ARB textures broken after r137498.
https://bugs.webkit.org/show_bug.cgi?id=105165
Disable antialiasing for ARB textures after unifying
code paths. We are currently missing a fragment shader
to do antialiasing with ARB textures.
Reviewed by Kenneth Rohde Christiansen.
* platform/graphics/texmap/TextureMapperGL.cpp:
(WebCore::TextureMapperGL::drawTexture):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137900 => 137901)
--- trunk/Source/WebCore/ChangeLog 2012-12-17 13:54:48 UTC (rev 137900)
+++ trunk/Source/WebCore/ChangeLog 2012-12-17 14:01:37 UTC (rev 137901)
@@ -1,3 +1,17 @@
+2012-12-17 Zeno Albisser <z...@webkit.org>
+
+ [Texmap] Drawing of ARB textures broken after r137498.
+ https://bugs.webkit.org/show_bug.cgi?id=105165
+
+ Disable antialiasing for ARB textures after unifying
+ code paths. We are currently missing a fragment shader
+ to do antialiasing with ARB textures.
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * platform/graphics/texmap/TextureMapperGL.cpp:
+ (WebCore::TextureMapperGL::drawTexture):
+
2012-12-17 Eugene Klyuchnikov <eus...@chromium.org>
Web Inspector: Popup flickers when cursor moves between elements with same anchor.
Modified: trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp (137900 => 137901)
--- trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2012-12-17 13:54:48 UTC (rev 137900)
+++ trunk/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2012-12-17 14:01:37 UTC (rev 137901)
@@ -406,13 +406,13 @@
void TextureMapperGL::drawTexture(Platform3DObject texture, Flags flags, const IntSize& textureSize, const FloatRect& targetRect, const TransformationMatrix& modelViewMatrix, float opacity, const BitmapTexture* maskTexture, unsigned exposedEdges)
{
- bool needsAntialiasing = m_enableEdgeDistanceAntialiasing && !modelViewMatrix.isIntegerTranslation();
- if (needsAntialiasing && drawTextureWithAntialiasing(texture, flags, textureSize, targetRect, modelViewMatrix, opacity, maskTexture, exposedEdges))
- return;
-
bool useRect = flags & ShouldUseARBTextureRect;
bool masked = !!maskTexture;
+ bool needsAntialiasing = m_enableEdgeDistanceAntialiasing && !modelViewMatrix.isIntegerTranslation();
+ if (!useRect && needsAntialiasing && drawTextureWithAntialiasing(texture, flags, textureSize, targetRect, modelViewMatrix, opacity, maskTexture, exposedEdges))
+ return;
+
TextureMapperShaderManager::ShaderKey key = TextureMapperShaderManager::Default;
if (masked && useRect)
key = TextureMapperShaderManager::MaskedRect;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
