diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-16 13:06:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-16 13:06:11 -0700 |
| commit | c9efa1bf37f8bbf12a5b5dd465cbfb06c8053d9c (patch) | |
| tree | 83bf87cdc2d58523eb0712949d3b7a605a99035e /Source/WebCore/platform/graphics/android/rendering/ShaderProgram.h | |
| parent | 893264ea664be9af3ac64e24116045b51df6f031 (diff) | |
| parent | 8fef2be984d1ec0e21a2efb0228702ea44993ed4 (diff) | |
| download | external_webkit-c9efa1bf37f8bbf12a5b5dd465cbfb06c8053d9c.zip external_webkit-c9efa1bf37f8bbf12a5b5dd465cbfb06c8053d9c.tar.gz external_webkit-c9efa1bf37f8bbf12a5b5dd465cbfb06c8053d9c.tar.bz2 | |
Merge "Move the common matrix computation to higher level"
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/ShaderProgram.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/ShaderProgram.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/ShaderProgram.h b/Source/WebCore/platform/graphics/android/rendering/ShaderProgram.h index 41f5e70..b44c563 100644 --- a/Source/WebCore/platform/graphics/android/rendering/ShaderProgram.h +++ b/Source/WebCore/platform/graphics/android/rendering/ShaderProgram.h @@ -159,7 +159,7 @@ public: private: GLuint loadShader(GLenum shaderType, const char* pSource); GLint createProgram(const char* vertexSource, const char* fragmentSource); - GLfloat* getProjectionMatrix(const DrawQuadData* data); + GLfloat* getTileProjectionMatrix(const DrawQuadData* data); void setBlendingState(bool enableBlending); void drawQuadInternal(ShaderType type, const GLfloat* matrix, int textureId, float opacity, GLenum textureTarget, GLenum filter, @@ -167,7 +167,7 @@ private: Color shaderColor(Color pureColor, float opacity); ShaderType getTextureShaderType(GLenum textureTarget); void resetBlending(); - + void setupSurfaceProjectionMatrix(); #if DEBUG_MATRIX FloatRect debugMatrixTransform(const TransformationMatrix& matrix, const char* matrixName); void debugMatrixInfo(float currentScale, @@ -179,6 +179,7 @@ private: bool m_blendingEnabled; + TransformationMatrix m_surfaceProjectionMatrix; TransformationMatrix m_clipProjectionMatrix; TransformationMatrix m_visibleRectProjectionMatrix; GLuint m_textureBuffer[1]; |