diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-22 00:35:09 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-22 00:35:09 +0000 |
| commit | 64bb413a664001c95c8439cf097dc3033f4ed733 (patch) | |
| tree | d4562f7bb5656865d32e5d684b5a41542ecfaf58 /libs/hwui/Caches.h | |
| parent | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (diff) | |
| download | frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.zip frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.tar.gz frameworks_base-64bb413a664001c95c8439cf097dc3033f4ed733.tar.bz2 | |
Revert "resolved conflicts for merge of 220c3f4f to master"
Reverted as hwui doesn't agree.
This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.
Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
Diffstat (limited to 'libs/hwui/Caches.h')
| -rw-r--r-- | libs/hwui/Caches.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/hwui/Caches.h b/libs/hwui/Caches.h index 2c7a88f..4b8b626 100644 --- a/libs/hwui/Caches.h +++ b/libs/hwui/Caches.h @@ -386,13 +386,13 @@ private: bool bindIndicesBufferInternal(const GLuint buffer); - static void eventMarkNull(GLsizei /* length */, const GLchar* /* marker */) { } - static void startMarkNull(GLsizei /* length */, const GLchar* /* marker */) { } + static void eventMarkNull(GLsizei length, const GLchar* marker) { } + static void startMarkNull(GLsizei length, const GLchar* marker) { } static void endMarkNull() { } - static void setLabelNull(GLenum /* type */, uint /* object */, GLsizei /* length */, - const char* /* label */) { } - static void getLabelNull(GLenum /* type */, uint /* object */, GLsizei /* bufferSize */, + static void setLabelNull(GLenum type, uint object, GLsizei length, + const char* label) { } + static void getLabelNull(GLenum type, uint object, GLsizei bufferSize, GLsizei* length, char* label) { if (length) *length = 0; if (label) *label = '\0'; |