From 64bb413a664001c95c8439cf097dc3033f4ed733 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Sat, 22 Nov 2014 00:35:09 +0000 Subject: Revert "resolved conflicts for merge of 220c3f4f to master" Reverted as hwui doesn't agree. This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9. Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a --- libs/hwui/ProgramCache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/hwui/ProgramCache.cpp') 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); -- cgit v1.2.3-59-g8ed1b