summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/ShaderProgram.cpp
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2011-02-01 12:38:10 -0800
committerNicolas Roard <nicolas@android.com>2011-02-01 12:38:10 -0800
commit4596782e9c024bb84cdcbf004330d88a401dbce0 (patch)
treea22017f68c941fc6cdda5459e17e9f3adc43f9cf /WebCore/platform/graphics/android/ShaderProgram.cpp
parentc6280ca9a4e12f9847852c063d5048a3d3d29422 (diff)
downloadexternal_webkit-4596782e9c024bb84cdcbf004330d88a401dbce0.zip
external_webkit-4596782e9c024bb84cdcbf004330d88a401dbce0.tar.gz
external_webkit-4596782e9c024bb84cdcbf004330d88a401dbce0.tar.bz2
Initialize correctly the maximum texture size in
case it was not. fix regression bug:3412928 Change-Id: Ie83dd50163ef4435cd88471127869114e41068cc
Diffstat (limited to 'WebCore/platform/graphics/android/ShaderProgram.cpp')
-rw-r--r--WebCore/platform/graphics/android/ShaderProgram.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/ShaderProgram.cpp b/WebCore/platform/graphics/android/ShaderProgram.cpp
index 8da6855..bb12c3c 100644
--- a/WebCore/platform/graphics/android/ShaderProgram.cpp
+++ b/WebCore/platform/graphics/android/ShaderProgram.cpp
@@ -29,6 +29,7 @@
#if USE(ACCELERATED_COMPOSITING)
#include "GLUtils.h"
+#include "TilesManager.h"
#include <GLES2/gl2.h>
#include <cutils/log.h>
@@ -175,6 +176,9 @@ void ShaderProgram::init()
glGenBuffers(1, m_textureBuffer);
glBindBuffer(GL_ARRAY_BUFFER, m_textureBuffer[0]);
glBufferData(GL_ARRAY_BUFFER, 2 * 4 * sizeof(GLfloat), coord, GL_STATIC_DRAW);
+
+ if (m_program != -1)
+ TilesManager::instance()->checkMaxTextureSize();
}
/////////////////////////////////////////////////////////////////////////////////////////