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/ProgramCache.cpp | |
| parent | 8a902d9f24e83c87b054adb5836b4a5b8a257be9 (diff) | |
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/ProgramCache.cpp')
| -rw-r--r-- | libs/hwui/ProgramCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp index a5b98515006d..62835e01cb3a 100644 --- a/libs/hwui/ProgramCache.cpp +++ b/libs/hwui/ProgramCache.cpp @@ -449,7 +449,7 @@ Program* ProgramCache::get(const ProgramDescription& description) { // Program generation /////////////////////////////////////////////////////////////////////////////// -Program* ProgramCache::generateProgram(const ProgramDescription& description, programid /* key */) { +Program* ProgramCache::generateProgram(const ProgramDescription& description, programid key) { String8 vertexShader = generateVertexShader(description); String8 fragmentShader = generateFragmentShader(description); |