diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-06-22 11:42:43 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-06-22 11:42:43 -0700 |
| commit | 3508b05a4b38911324b4dcab4c5d30c4ac7bb0e9 (patch) | |
| tree | b77c8ec1591346333ebbd1f36fef9e317b4505ca /Source/WebCore | |
| parent | 4b97cf9c52f5ec2971f86b60f757f3d6d37c59ab (diff) | |
| download | external_webkit-3508b05a4b38911324b4dcab4c5d30c4ac7bb0e9.zip external_webkit-3508b05a4b38911324b4dcab4c5d30c4ac7bb0e9.tar.gz external_webkit-3508b05a4b38911324b4dcab4c5d30c4ac7bb0e9.tar.bz2 | |
Browser ST: Lower the upper limit for texture allocation
Change-Id: Ie88de19e89e298b69b106fbb42d2b9d26bb98014
Diffstat (limited to 'Source/WebCore')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TilesManager.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/TilesManager.cpp b/Source/WebCore/platform/graphics/android/TilesManager.cpp index 5a9a164..e4e8af7 100644 --- a/Source/WebCore/platform/graphics/android/TilesManager.cpp +++ b/Source/WebCore/platform/graphics/android/TilesManager.cpp @@ -57,8 +57,12 @@ // In our case, we use 300x300 textures. On the tablet, this equates to // at least 5 * 3 = 15 textures. We also enable offscreen textures to a maximum // of 101 textures used (i.e. ~70Mb max, accounting for the double buffer textures) -#define EXPANDED_TILE_BOUNDS_X 1 -#define EXPANDED_TILE_BOUNDS_Y 2 +// Now we switch to Surface Texture, which is triple buffering. In order to +// avoid OOM issue, we limit the bounds number to 0. +// TODO: We should either dynamically change the outer bound by detecting the +// HW limit or save further in the GPU memory consumption. +#define EXPANDED_TILE_BOUNDS_X 0 +#define EXPANDED_TILE_BOUNDS_Y 0 #define MAX_TEXTURE_ALLOCATION 3+(5+EXPANDED_TILE_BOUNDS_X*2)*(3+EXPANDED_TILE_BOUNDS_Y*2)*2 #define TILE_WIDTH 300 #define TILE_HEIGHT 300 |