diff options
| author | 2014-06-16 10:39:33 -0700 | |
|---|---|---|
| committer | 2014-06-16 10:39:33 -0700 | |
| commit | 2357d72ce2427c7b91f8c23487f0d49590e78ea6 (patch) | |
| tree | e80a70d0e887cc97f7900653e473ff85c673146b /libs/hwui/TextureCache.h | |
| parent | 1dc55c3f81fe6394296c2e38124b8710e79cb0a0 (diff) | |
| parent | ecae1ffd7719a60e471550436f885299d27de7df (diff) | |
resolved conflicts for merge of ecae1ffd to master
Change-Id: I1ba660ce832e3360fa136be6aa0415645bfda328
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 e5b5c1a0048f..61db5b01f277 100644 --- a/libs/hwui/TextureCache.h +++ b/libs/hwui/TextureCache.h @@ -142,7 +142,7 @@ private: void generateTexture(const SkBitmap* bitmap, Texture* texture, bool regenerate = false); void uploadLoFiTexture(bool resize, const 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(); |