diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-21 21:38:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 21:38:42 +0000 |
| commit | 99377df12ee696e01cd9071132f122801a9862ce (patch) | |
| tree | 01769a67c494fe1f8264581d4f01e94705ce9c5f /libs/hwui/ProgramCache.cpp | |
| parent | e606a7884dff4acc926cb82bf6492e83e9a1d3af (diff) | |
| parent | d2738eadc1f8c92c64d47429ef3f168738431809 (diff) | |
am d2738ead: Merge "Frameworks/base: Unused parameters in hwui"
* commit 'd2738eadc1f8c92c64d47429ef3f168738431809':
Frameworks/base: Unused parameters in hwui
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 06353c096adc..a5911504f6c0 100644 --- a/libs/hwui/ProgramCache.cpp +++ b/libs/hwui/ProgramCache.cpp @@ -455,7 +455,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); |