diff options
| author | Romain Guy <romainguy@google.com> | 2011-05-02 18:33:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-02 18:33:26 -0700 |
| commit | df0a7fbdcff3c683641b7980da50a7d0eebe0876 (patch) | |
| tree | bce1f0ec1aecb5735a1dd17a7a5a87f13d7a94b0 /libs/hwui/OpenGLRenderer.h | |
| parent | 8ef9eaaea8cc27145bf159e45b7d9eaa0aae6d5c (diff) | |
| parent | 8f0095cd33558e9cc8a440047908e53b68906f5f (diff) | |
| download | frameworks_base-df0a7fbdcff3c683641b7980da50a7d0eebe0876.zip frameworks_base-df0a7fbdcff3c683641b7980da50a7d0eebe0876.tar.gz frameworks_base-df0a7fbdcff3c683641b7980da50a7d0eebe0876.tar.bz2 | |
Merge "Allows to render with an OpenGL context inside a TextureView."
Diffstat (limited to 'libs/hwui/OpenGLRenderer.h')
| -rw-r--r-- | libs/hwui/OpenGLRenderer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index 6ffd931..b5c37c2 100644 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -465,7 +465,8 @@ private: void setupDrawSimpleMesh(); void setupDrawTexture(GLuint texture); void setupDrawExternalTexture(GLuint texture); - void setupDrawTextureTransform(mat4& transform); + void setupDrawTextureTransform(); + void setupDrawTextureTransformUniforms(mat4& transform); void setupDrawMesh(GLvoid* vertices, GLvoid* texCoords = NULL, GLuint vbo = 0); void setupDrawVertices(GLvoid* vertices); void setupDrawAALine(GLvoid* vertices, GLvoid* distanceCoords, GLvoid* lengthCoords, |