Merge "remove libui dependency on libEGL" (561d42d8) · Commits · e / os / android_frameworks_native-old

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 */

+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;

deleted100644 → 0

+0 −39

Original line number	Diff line number	Diff line
		#include <errno.h>
		#include <stdio.h>
		#include <stdlib.h>
		#include <sys/mman.h>
		#include <unistd.h>
		#include <fcntl.h>

		static void map_memory(const char fn, unsigned base, unsigned size)
		{
		int fd;
		void *ptr;

		fd = open(fn, O_RDWR \| O_SYNC);
		if(fd < 0) {
		perror("cannot open %s for mapping");
		return MAP_FAILED;
		}

		ptr = mmap(0, size, PROT_READ \| PROT_WRITE,
		MAP_SHARED, fd, base);
		close(fd);

		if(ptr == MAP_FAILED) {
		fprintf(stderr,"cannot map %s (@%08x,%08x)\n", fn, base, size);
		}
		return ptr;
		}


		int main(int argc, char** argv)
		{
		void grp_regs = map_memory("/dev/hw3d", 0, 1024 1024);
		printf("GPU base mapped at %p\n", grp_regs);
		int state_offset = 0x10140;
		printf("GPU state = %08lx\n",
		((long)((char*)grp_regs + state_offset)) );

		return 0;
		}