Merge "remove libui dependency on libEGL" (f9c83f37) · Commits · e / os / android_frameworks_base

include/ui/EGLUtils.h

deleted100644 → 0

+0 −53

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 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.
		*/


		#ifndef ANDROID_UI_EGLUTILS_H
		#define ANDROID_UI_EGLUTILS_H

		#include <utils/Errors.h>
		#include <ui/PixelFormat.h>
		#include <EGL/egl.h>


		// ----------------------------------------------------------------------------
		namespace android {
		// ----------------------------------------------------------------------------

		class EGLUtils
		{
		public:

		static const char *strerror(EGLint err);

		static status_t selectConfigForPixelFormat(
		EGLDisplay dpy,
		EGLint const* attrs,
		PixelFormat format,
		EGLConfig* outConfig);

		static status_t selectConfigForNativeWindow(
		EGLDisplay dpy,
		EGLint const* attrs,
		EGLNativeWindowType window,
		EGLConfig* outConfig);
		};

		// ----------------------------------------------------------------------------
		}; // namespace android
		// ----------------------------------------------------------------------------

		#endif /* ANDROID_UI_EGLUTILS_H */

+23 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		#include <ui/FramebufferNativeWindow.h>
		#include <ui/PixelFormat.h>
		#include <ui/EGLUtils.h>
		#include <ui/egl/android_natives.h>

		#include <sys/types.h>
		@@ -47,6 +46,29 @@ using namespace android::renderscript;
		static int32_t gGLContextCount = 0;

		static void checkEglError(const char* op, EGLBoolean returnVal = EGL_TRUE) {
		struct EGLUtils {
		static const char *strerror(EGLint err) {
		switch (err){
		case EGL_SUCCESS: return "EGL_SUCCESS";
		case EGL_NOT_INITIALIZED: return "EGL_NOT_INITIALIZED";
		case EGL_BAD_ACCESS: return "EGL_BAD_ACCESS";
		case EGL_BAD_ALLOC: return "EGL_BAD_ALLOC";
		case EGL_BAD_ATTRIBUTE: return "EGL_BAD_ATTRIBUTE";
		case EGL_BAD_CONFIG: return "EGL_BAD_CONFIG";
		case EGL_BAD_CONTEXT: return "EGL_BAD_CONTEXT";
		case EGL_BAD_CURRENT_SURFACE: return "EGL_BAD_CURRENT_SURFACE";
		case EGL_BAD_DISPLAY: return "EGL_BAD_DISPLAY";
		case EGL_BAD_MATCH: return "EGL_BAD_MATCH";
		case EGL_BAD_NATIVE_PIXMAP: return "EGL_BAD_NATIVE_PIXMAP";
		case EGL_BAD_NATIVE_WINDOW: return "EGL_BAD_NATIVE_WINDOW";
		case EGL_BAD_PARAMETER: return "EGL_BAD_PARAMETER";
		case EGL_BAD_SURFACE: return "EGL_BAD_SURFACE";
		case EGL_CONTEXT_LOST: return "EGL_CONTEXT_LOST";
		default: return "UNKNOWN";
		}
		}
		};

		if (returnVal != EGL_TRUE) {
		fprintf(stderr, "%s() returned %d\n", op, returnVal);
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@ LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		EGLUtils.cpp \
		FramebufferNativeWindow.cpp \
		GraphicBuffer.cpp \
		GraphicBufferAllocator.cpp \
		@@ -28,7 +27,6 @@ LOCAL_SRC_FILES:= \
		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libutils \
		libEGL \
		libhardware

		ifneq ($(BOARD_FRAMEBUFFER_FORCE_FORMAT),)

+1 −8

Original line number	Diff line number	Diff line
		@@ -4,14 +4,7 @@ LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)
		LOCAL_SRC_FILES:= app-linux.cpp demo.c.arm
		LOCAL_SHARED_LIBRARIES := libEGL libGLESv1_CM libui
		LOCAL_C_INCLUDES += frameworks/base/opengl/tests/include
		LOCAL_MODULE:= angeles
		LOCAL_MODULE_TAGS := optional
		include $(BUILD_EXECUTABLE)


		include $(CLEAR_VARS)
		LOCAL_SRC_FILES:= gpustate.c
		LOCAL_SHARED_LIBRARIES := libEGL libGLESv1_CM
		LOCAL_MODULE:= gpustate
		LOCAL_MODULE_TAGS := optional
		include $(BUILD_EXECUTABLE)

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@
		#include <GLES/gl.h>

		#include <ui/FramebufferNativeWindow.h>
		#include <ui/EGLUtils.h>
		#include "EGLUtils.h"

		using namespace android;