diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-21 22:20:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-21 22:20:31 +0000 |
| commit | 220c3f4f48b53b6010093a1ef437f4197a382ebf (patch) | |
| tree | 31c7b8a68b1463511f9647b3928890f50c72c82a /libs/hwui/ProgramCache.cpp | |
| parent | 79ef5ef7a58baf17f7c3522a5aeb041f5206c32a (diff) | |
| parent | 2ab8298dc37851aab4623ba3f98d71055d653a73 (diff) | |
Merge "resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
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 62835e01cb3a..a5b98515006d 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); |