Changeset 83674 in webkit

Timestamp:

Apr 12, 2011 5:50:36 PM (13 years ago)

Author:

enne@google.com

Message:

2011-04-12 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] TilingData mishandles very small texture sizes
​https://bugs.webkit.org/show_bug.cgi?id=58364

Use zero tiles when the texture size is too small for tiling.

• platform/graphics/gpu/TilingData.cpp: (WebCore::TilingData::TilingData): (WebCore::TilingData::setMaxTextureSize):

2011-04-12 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] TilingData mishandles very small texture sizes
​https://bugs.webkit.org/show_bug.cgi?id=58364

Update test to properly handle texture sizes of 0-3.

• tests/TilingDataTest.cpp: (WebCore::TEST):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/gpu/TilingData.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/TilingDataTest.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-12  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] TilingData mishandles very small texture sizes
+        https://bugs.webkit.org/show_bug.cgi?id=58364
+
+        Use zero tiles when the texture size is too small for tiling.
+
+        * platform/graphics/gpu/TilingData.cpp:
+        (WebCore::TilingData::TilingData):
+        (WebCore::TilingData::setMaxTextureSize):
+
 2011-04-12  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/platform/graphics/gpu/TilingData.cpp

@@ -45 +45 @@
 static int computeNumTiles(int maxTextureSize, int totalSize, int borderTexels)
 {
+    if (maxTextureSize - 2 * borderTexels <= 0)
+        return 0;
+
     int numTiles = max(1, 1 + (totalSize - 1 - 2 * borderTexels) / (maxTextureSize - 2 * borderTexels));
     return totalSize > 0 ? numTiles : 0;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-12  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] TilingData mishandles very small texture sizes
+        https://bugs.webkit.org/show_bug.cgi?id=58364
+
+        Update test to properly handle texture sizes of 0-3.
+
+        * tests/TilingDataTest.cpp:
+        (WebCore::TEST):
+
 2011-04-12  Jian Li  <jianli@chromium.org>
 

trunk/Source/WebKit/chromium/tests/TilingDataTest.cpp

@@ -50 +50 @@
 TEST(TilingDataTest, numTiles_TilingNoBorders)
 {
+    EXPECT_EQ(0, TilingData(0,  0,  0, false).numTiles());
+    EXPECT_EQ(0, TilingData(0,  4,  0, false).numTiles());
+    EXPECT_EQ(0, TilingData(0,  0,  4, false).numTiles());
+    EXPECT_EQ(0, TilingData(4,  4,  0, false).numTiles());
+    EXPECT_EQ(0, TilingData(4,  0,  4, false).numTiles());
+    EXPECT_EQ(0, TilingData(-8, 1,  1, false).numTiles());
+    EXPECT_EQ(0, TilingData(-1, 1,  1, false).numTiles());
+    EXPECT_EQ(0, TilingData(0,  1,  1, false).numTiles());
+
+    EXPECT_EQ(1, TilingData(1,  1,  1, false).numTiles());
+    EXPECT_EQ(2, TilingData(1,  1,  2, false).numTiles());
+    EXPECT_EQ(1, TilingData(2,  2,  2, false).numTiles());
+    EXPECT_EQ(1, TilingData(3,  3,  3, false).numTiles());
+
     EXPECT_EQ(1, TilingData(4,  1,  4, false).numTiles());
     EXPECT_EQ(1, TilingData(4,  2,  4, false).numTiles());
@@ -83 +97 @@
 TEST(TilingDataTest, numTiles_TilingWithBorders)
 {
+    EXPECT_EQ(0, TilingData(0,  0,  0, true).numTiles());
+    EXPECT_EQ(0, TilingData(0,  4,  0, true).numTiles());
+    EXPECT_EQ(0, TilingData(0,  0,  4, true).numTiles());
+    EXPECT_EQ(0, TilingData(4,  4,  0, true).numTiles());
+    EXPECT_EQ(0, TilingData(4,  0,  4, true).numTiles());
+    EXPECT_EQ(0, TilingData(-8, 1,  1, true).numTiles());
+    EXPECT_EQ(0, TilingData(-1, 1,  1, true).numTiles());
+    EXPECT_EQ(0, TilingData(0,  1,  1, true).numTiles());
+
+    EXPECT_EQ(0, TilingData(1,  1,  1, true).numTiles());
+    EXPECT_EQ(0, TilingData(1,  1,  2, true).numTiles());
+    EXPECT_EQ(0, TilingData(2,  2,  2, true).numTiles());
+
     EXPECT_EQ(1, TilingData(3,  1,  3, true).numTiles());
     EXPECT_EQ(1, TilingData(3,  2,  3, true).numTiles());
@@ -362 +389 @@
 }
 
-TEST(TilingDataTest, setMaxTextureSize)
+TEST(TilingDataTest, setMaxTextureSizeNoBorders)
 {
     TilingData data(8, 16, 32, false);
@@ -384 +411 @@
 }
 
+TEST(TilingDataTest, setMaxTextureSizeBorders)
+{
+    TilingData data(8, 16, 32, true);
+    EXPECT_EQ(3, data.numTilesX());
+    EXPECT_EQ(5, data.numTilesY());
+
+    data.setMaxTextureSize(32);
+    EXPECT_EQ(32, data.maxTextureSize());
+    EXPECT_EQ(1, data.numTilesX());
+    EXPECT_EQ(1, data.numTilesY());
+
+    data.setMaxTextureSize(2);
+    EXPECT_EQ(2, data.maxTextureSize());
+    EXPECT_EQ(0, data.numTilesX());
+    EXPECT_EQ(0, data.numTilesY());
+
+    data.setMaxTextureSize(5);
+    EXPECT_EQ(5, data.maxTextureSize());
+    EXPECT_EQ(5, data.numTilesX());
+    EXPECT_EQ(10, data.numTilesY());
+}
+
 } // namespace