Merge "Remove warning" (56af3176) · Commits · e / os / android_frameworks_base

libs/hwui/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ ifeq ($(USE_OPENGL_RENDERER),true)
		Extensions.cpp \
		FboCache.cpp \
		GradientCache.cpp \
		Image.cpp \
		Layer.cpp \
		LayerCache.cpp \
		LayerRenderer.cpp \

libs/hwui/Image.cpp

0 → 100644

+62 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define LOG_TAG "OpenGLRenderer"

		#include <utils/Log.h>

		#include "Image.h"

		namespace android {
		namespace uirenderer {

		Image::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::~Image() {
		if (mImage != EGL_NO_IMAGE_KHR) {
		eglDestroyImageKHR(eglGetDisplay(EGL_DEFAULT_DISPLAY), mImage);
		mImage = EGL_NO_IMAGE_KHR;

		glDeleteTextures(1, &mTexture);
		mTexture = 0;
		}
		}

		}; // namespace uirenderer
		}; // namespace android

libs/hwui/Image.h

+2 −38

Original line number	Diff line number	Diff line
		@@ -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 @@ public:
		* 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