commit 1212c9dafe932f70956651338568c5e1fdf21bcf
author Romain Guy <romainguy@google.com> Thu May 02 17:50:23 2013 -0700
committer Romain Guy <romainguy@google.com> Thu May 02 17:50:23 2013 -0700
tree 33b43e4da522d418e006ec0bc352df2e095e73cb
parent 877cfe0e32a845d5a58252b8a6e1f54f95b4379c

Remove warning

Change-Id: Ia1523d02dc2b7f58ca26a142a5aef710792a5f3d

libs/hwui/Image.h

diff --git a/libs/hwui/Image.h b/libs/hwui/Image.h
index 3f2978f..2514535 100644
--- a/libs/hwui/Image.h
+++ b/libs/hwui/Image.h
@@ -17,8 +17,6 @@
 #ifndef ANDROID_HWUI_IMAGE_H
 #define ANDROID_HWUI_IMAGE_H
 
-#define LOG_TAG "OpenGLRenderer"
-
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
@@ -27,8 +25,6 @@
 
 #include <ui/GraphicBuffer.h>
 
-#include <utils/Log.h>
-
 namespace android {
 namespace uirenderer {
 
@@ -42,40 +38,8 @@
      * cannot be created, getTexture() will return 0 and getImage() will
      * return EGL_NO_IMAGE_KHR.
      */
-    Image(sp<GraphicBuffer> buffer) {
-        // Create the EGLImage object that maps the GraphicBuffer
-        EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-        EGLClientBuffer clientBuffer = (EGLClientBuffer) buffer->getNativeBuffer();
-        EGLint attrs[] = { EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE };
-
-        mImage = eglCreateImageKHR(display, EGL_NO_CONTEXT,
-                EGL_NATIVE_BUFFER_ANDROID, clientBuffer, attrs);
-
-        if (mImage == EGL_NO_IMAGE_KHR) {
-            ALOGW("Error creating image (%#x)", eglGetError());
-            mTexture = 0;
-        } else {
-            // Create a 2D texture to sample from the EGLImage
-            glGenTextures(1, &mTexture);
-            glBindTexture(GL_TEXTURE_2D, mTexture);
-            glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, mImage);
-
-            GLenum status = GL_NO_ERROR;
-            while ((status = glGetError()) != GL_NO_ERROR) {
-                ALOGW("Error creating image (%#x)", status);
-            }
-        }
-    }
-
-    ~Image() {
-        if (mImage != EGL_NO_IMAGE_KHR) {
-            eglDestroyImageKHR(eglGetDisplay(EGL_DEFAULT_DISPLAY), mImage);
-            mImage = EGL_NO_IMAGE_KHR;
-
-            glDeleteTextures(1, &mTexture);
-            mTexture = 0;
-        }
-    }
+    Image(sp<GraphicBuffer> buffer);
+    ~Image();
 
     /**
      * Returns the name of the GL texture that can be used to sample