diff options
| author | 2014-06-16 17:13:53 +0000 | |
|---|---|---|
| committer | 2014-06-16 17:13:53 +0000 | |
| commit | df36dd200c55a6ad463b46bab0ffff49d21206ff (patch) | |
| tree | 7881bfd7563881390eb4914efc199517edf66d57 /libs/hwui/TextureCache.h | |
| parent | 080671c5383f4b98303c143a685b9f5e75cfe781 (diff) | |
| parent | 386caf6c8f276f1d03ea077bc799df2a937ef500 (diff) | |
am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20"
* commit '386caf6c8f276f1d03ea077bc799df2a937ef500':
update parameters in uploadToTexture() for GLES20
Diffstat (limited to 'libs/hwui/TextureCache.h')
| -rw-r--r-- | libs/hwui/TextureCache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/TextureCache.h b/libs/hwui/TextureCache.h index 57fc19a16f49..909d76257b91 100644 --- a/libs/hwui/TextureCache.h +++ b/libs/hwui/TextureCache.h @@ -125,7 +125,7 @@ private: void generateTexture(SkBitmap* bitmap, Texture* texture, bool regenerate = false); void uploadLoFiTexture(bool resize, SkBitmap* bitmap, uint32_t width, uint32_t height); - void uploadToTexture(bool resize, GLenum format, GLsizei stride, + void uploadToTexture(bool resize, GLenum format, GLsizei stride, GLsizei bpp, GLsizei width, GLsizei height, GLenum type, const GLvoid * data); void init(); |