commit 64bb413a664001c95c8439cf097dc3033f4ed733
author Andreas Gampe <agampe@google.com> Sat Nov 22 00:35:09 2014 +0000
committer Andreas Gampe <agampe@google.com> Sat Nov 22 00:35:09 2014 +0000
tree d4562f7bb5656865d32e5d684b5a41542ecfaf58
parent 8a902d9f24e83c87b054adb5836b4a5b8a257be9

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

Reverted as hwui doesn't agree.

This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.

Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 47f14c8..ee629c0 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -123,13 +123,13 @@
     setSurface(window);
 }
 
-void CanvasContext::pauseSurface(ANativeWindow* /* window */) {
+void CanvasContext::pauseSurface(ANativeWindow* window) {
     stopDrawing();
 }
 
 // TODO: don't pass viewport size, it's automatic via EGL
-void CanvasContext::setup(int /* width */, int /* height */, const Vector3& lightCenter,
-        float lightRadius, uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha) {
+void CanvasContext::setup(int width, int height, const Vector3& lightCenter, float lightRadius,
+        uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha) {
     if (!mCanvas) return;
     mCanvas->initLight(lightCenter, lightRadius, ambientShadowAlpha, spotShadowAlpha);
 }

libs/hwui/renderthread/RenderProxy.cpp

diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index d418576..3d106b7 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -340,16 +340,14 @@
     }
 }
 
-template <typename T>
-void UNUSED(T) {}
-
-
 CREATE_BRIDGE0(fence) {
     // Intentionally empty
-    UNUSED(args);
     return NULL;
 }
 
+template <typename T>
+void UNUSED(T t) {}
+
 void RenderProxy::fence() {
     SETUP_TASK(fence);
     UNUSED(args);

libs/hwui/renderthread/RenderThread.cpp

diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 6983e2b..f887103 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -171,7 +171,7 @@
     mRenderState = new RenderState(*this);
 }
 
-int RenderThread::displayEventReceiverCallback(int /* fd */, int events, void* data) {
+int RenderThread::displayEventReceiverCallback(int fd, int events, void* data) {
     if (events & (Looper::EVENT_ERROR | Looper::EVENT_HANGUP)) {
         ALOGE("Display event receiver pipe was closed or an error occurred.  "
                 "events=0x%x", events);