diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-21 14:19:06 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-21 14:19:06 -0800 |
| commit | 2ab8298dc37851aab4623ba3f98d71055d653a73 (patch) | |
| tree | e31d76f1c16ec8e980983392b09287515bcec2f1 /libs/hwui/renderthread/RenderProxy.cpp | |
| parent | 4c9041cf837cda13c749b148661d18c3fab0fbd6 (diff) | |
| parent | 99377df12ee696e01cd9071132f122801a9862ce (diff) | |
resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
Diffstat (limited to 'libs/hwui/renderthread/RenderProxy.cpp')
| -rw-r--r-- | libs/hwui/renderthread/RenderProxy.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index 3d106b733a7e..d418576e0fea 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -340,14 +340,16 @@ void RenderProxy::trimMemory(int level) { } } +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); |