summaryrefslogtreecommitdiff
path: root/libs/hwui/ProgramCache.cpp
diff options
context:
space:
mode:
author John Reck <jreck@android.com> 2014-11-22 00:10:45 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-11-22 00:10:45 +0000
commitad9387974b02528ff0366134a3740d66fb0b1cd5 (patch)
treefd4b193cf1e8da9c3238841f27140672cdf22420 /libs/hwui/ProgramCache.cpp
parentd2738eadc1f8c92c64d47429ef3f168738431809 (diff)
parent8b59a528b54279ce640b2d23a00acae1d0f477c5 (diff)
Merge "Revert "Frameworks/base: Unused parameters in hwui""
Diffstat (limited to 'libs/hwui/ProgramCache.cpp')
-rw-r--r--libs/hwui/ProgramCache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/ProgramCache.cpp b/libs/hwui/ProgramCache.cpp
index a5911504f6c0..06353c096adc 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);