Merge "Convert lib to Android.bp" (06187ec1) · Commits · e / os / platform_frameworks_native

opengl/tests/Android.bp

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		subdirs = [
		"hwc",
		"lib",
		]

opengl/tests/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ dirs := \
		gl_perf \
		gl_yuvtex \
		gralloc \
		hwc \
		include \
		lib \
		linetex \

opengl/tests/hwc/Android.bp

0 → 100644

+102 −0

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

		cc_defaults {

		name: "hwc_tests_defaults",
		cflags: [
		"-DGL_GLEXT_PROTOTYPES",
		"-DEGL_EGLEXT_PROTOTYPES",
		"-Wall",
		"-Wextra",
		"-Werror",
		],
		}

		cc_library_static {

		name: "libhwcTest",
		srcs: ["hwcTestLib.cpp"],

		static_libs: [
		"libarect",
		"libglTest",
		"libtestUtil",
		],
		defaults: ["hwc_tests_defaults"],
		}

		cc_defaults {

		name: "hwc_lib_defaults",
		shared_libs: [
		"libcutils",
		"libEGL",
		"libGLESv2",
		"libhardware",
		"liblog",
		"libui",
		"libutils",
		],

		static_libs: [
		"libglTest",
		"libhwcTest",
		"libtestUtil",
		],
		}

		cc_test {

		name: "hwcStress",
		srcs: ["hwcStress.cpp"],

		defaults: [
		"hwc_lib_defaults",
		"hwc_tests_defaults",
		],
		}

		cc_test {

		name: "hwcRects",
		srcs: ["hwcRects.cpp"],

		defaults: [
		"hwc_lib_defaults",
		"hwc_tests_defaults",
		],
		}

		cc_test {

		name: "hwcColorEquiv",
		srcs: ["hwcColorEquiv.cpp"],

		defaults: [
		"hwc_lib_defaults",
		"hwc_tests_defaults",
		],
		}

		cc_test {

		name: "hwcCommit",
		srcs: ["hwcCommit.cpp"],

		defaults: [
		"hwc_lib_defaults",
		"hwc_tests_defaults",
		],
		}

opengl/tests/hwc/Android.mk

deleted100644 → 0

+0 −150

Original line number	Diff line number	Diff line
		# Copyright (C) 2010 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.

		LOCAL_PATH:= $(call my-dir)

		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE_TAGS := tests
		LOCAL_MODULE:= libhwcTest
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror
		LOCAL_CXX_STL := libc++
		LOCAL_SRC_FILES:= hwcTestLib.cpp
		LOCAL_C_INCLUDES += system/extras/tests/include \
		$(call include-path-for, opengl-tests-includes) \

		LOCAL_STATIC_LIBRARIES := libarect

		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE:= hwcStress
		LOCAL_MODULE_TAGS := tests
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror
		LOCAL_CXX_STL := libc++
		LOCAL_SRC_FILES:= hwcStress.cpp

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libEGL \
		libGLESv2 \
		libutils \
		liblog \
		libui \
		libhardware \

		LOCAL_STATIC_LIBRARIES := \
		libtestUtil \
		libglTest \
		libhwcTest \

		LOCAL_C_INCLUDES += \
		system/extras/tests/include \
		hardware/libhardware/include \
		$(call include-path-for, opengl-tests-includes) \

		include $(BUILD_NATIVE_TEST)

		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE:= hwcRects
		LOCAL_MODULE_TAGS := tests
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror
		LOCAL_CXX_STL := libc++
		LOCAL_SRC_FILES:= hwcRects.cpp

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libEGL \
		libGLESv2 \
		libutils \
		liblog \
		libui \
		libhardware \

		LOCAL_STATIC_LIBRARIES := \
		libtestUtil \
		libglTest \
		libhwcTest \

		LOCAL_C_INCLUDES += \
		system/extras/tests/include \
		hardware/libhardware/include \
		$(call include-path-for, opengl-tests-includes) \

		include $(BUILD_NATIVE_TEST)

		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE:= hwcColorEquiv
		LOCAL_MODULE_TAGS := tests
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror
		LOCAL_CXX_STL := libc++
		LOCAL_SRC_FILES:= hwcColorEquiv.cpp

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libEGL \
		libGLESv2 \
		libutils \
		liblog \
		libui \
		libhardware \

		LOCAL_STATIC_LIBRARIES := \
		libtestUtil \
		libglTest \
		libhwcTest \

		LOCAL_C_INCLUDES += \
		system/extras/tests/include \
		hardware/libhardware/include \
		$(call include-path-for, opengl-tests-includes) \

		include $(BUILD_NATIVE_TEST)

		include $(CLEAR_VARS)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE:= hwcCommit
		LOCAL_MODULE_TAGS := tests
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror
		LOCAL_CXX_STL := libc++
		LOCAL_SRC_FILES:= hwcCommit.cpp

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libEGL \
		libGLESv2 \
		libutils \
		liblog \
		libui \
		libhardware \

		LOCAL_STATIC_LIBRARIES := \
		libtestUtil \
		libglTest \
		libhwcTest \

		LOCAL_C_INCLUDES += \
		system/extras/tests/include \
		hardware/libhardware/include \
		$(call include-path-for, opengl-tests-includes) \

		include $(BUILD_NATIVE_TEST)

opengl/tests/include/EGLUtils.h

deleted100644 → 0

+0 −144

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 <stdint.h>
		#include <stdlib.h>

		#include <system/window.h>
		#include <utils/Errors.h>
		#include <EGL/egl.h>


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

		class EGLUtils
		{
		public:

		static inline const char *strerror(EGLint err);

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

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

		// ----------------------------------------------------------------------------

		const char *EGLUtils::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";
		}
		}

		status_t EGLUtils::selectConfigForPixelFormat(
		EGLDisplay dpy,
		EGLint const* attrs,
		int32_t format,
		EGLConfig* outConfig)
		{
		EGLint numConfigs = -1, n=0;

		if (!attrs)
		return BAD_VALUE;

		if (outConfig == NULL)
		return BAD_VALUE;

		// Get all the "potential match" configs...
		if (eglGetConfigs(dpy, NULL, 0, &numConfigs) == EGL_FALSE)
		return BAD_VALUE;

		EGLConfig* const configs = (EGLConfig)malloc(sizeof(EGLConfig)numConfigs);
		if (eglChooseConfig(dpy, attrs, configs, numConfigs, &n) == EGL_FALSE) {
		free(configs);
		return BAD_VALUE;
		}

		int i;
		EGLConfig config = NULL;
		for (i=0 ; i<n ; i++) {
		EGLint nativeVisualId = 0;
		eglGetConfigAttrib(dpy, configs[i], EGL_NATIVE_VISUAL_ID, &nativeVisualId);
		if (nativeVisualId>0 && format == nativeVisualId) {
		config = configs[i];
		break;
		}
		}

		free(configs);

		if (i<n) {
		*outConfig = config;
		return NO_ERROR;
		}

		return NAME_NOT_FOUND;
		}

		status_t EGLUtils::selectConfigForNativeWindow(
		EGLDisplay dpy,
		EGLint const* attrs,
		EGLNativeWindowType window,
		EGLConfig* outConfig)
		{
		int err;
		int format;

		if (!window)
		return BAD_VALUE;

		if ((err = window->query(window, NATIVE_WINDOW_FORMAT, &format)) < 0) {
		return err;
		}

		return selectConfigForPixelFormat(dpy, attrs, format, outConfig);
		}

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

		#endif /* ANDROID_UI_EGLUTILS_H */