Revert "resolved conflicts for merge of 220c3f4f to master"

Reverted as hwui doesn't agree.

This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.

Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a

1 files changed, 2 insertions, 4 deletions

diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 866d82d6a8a6..96a69f7e5cb5 100755
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -349,7 +349,7 @@ void OpenGLRenderer::resumeAfterLayer() {
     dirtyClip();
 }
 
-void OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& /* dirty */) {
+void OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) {
     if (mState.currentlyIgnored()) return;
 
     Rect clip(*mState.currentClipRect());
@@ -402,8 +402,6 @@ void OpenGLRenderer::eventMarkDEBUG(const char* fmt, ...) const {
     va_end(ap);
 
     eventMark(buf);
-#else
-    (void)fmt;
 #endif
 }
 
@@ -1050,7 +1048,7 @@ public:
     }
 
 protected:
-    virtual void shadeSpan(int /* x */, int /* y */, SkPMColor[], int /* count */) {
+    virtual void shadeSpan(int x, int y, SkPMColor[], int count) {
         LOG_ALWAYS_FATAL("LayerShader should never be drawn with raster backend.");
     }