Revert "resolved conflicts for merge of 220c3f4f to master"
Reverted as hwui doesn't agree.
This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.
Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
diff --git a/libs/hwui/SkiaShader.h b/libs/hwui/SkiaShader.h
index f61ba97..e110ca5 100644
--- a/libs/hwui/SkiaShader.h
+++ b/libs/hwui/SkiaShader.h
@@ -56,13 +56,12 @@
class InvalidSkiaShader {
public:
- static void describe(Caches* /* caches */, ProgramDescription& /* description */,
- const Extensions& /* extensions */, const SkShader& /* shader */) {
+ static void describe(Caches* caches, ProgramDescription& description,
+ const Extensions& extensions, const SkShader& shader) {
// This shader is unsupported. Skip it.
}
- static void setupProgram(Caches* /* caches */, const mat4& /* modelViewMatrix */,
- GLuint* /* textureUnit */, const Extensions& /* extensions */,
- const SkShader& /* shader */) {
+ static void setupProgram(Caches* caches, const mat4& modelViewMatrix,
+ GLuint* textureUnit, const Extensions& extensions, const SkShader& shader) {
// This shader is unsupported. Skip it.
}