From 8cf8f6b088cc014921e1a9b3d4ebc93c3b5de8b8 Mon Sep 17 00:00:00 2001 From: Greg Hartman Date: Fri, 17 Aug 2018 12:43:34 -0700 Subject: distrib/android-emugl: Move Android GPU emulation sources here. This patch is used to add the unmodified sources of the GPU emulation libraries that are normally under sdk/emulator/opengl/. These sources were originally built with the platform build system, but this is no longer the case. Since they are only built through the emulator's own build system (i.e. android-rebuild.sh), it's easier to put them under external/qemu/ to ensure that they are always in sync with the rest of the emulator. Note that the encoder sources are still in the platform under device/generic/goldfish/opengl/. A future patch will update the emulator build system to pick the sources from here, and another one will remove the sources from sdk/ after that. Note: these are the unmodified sources from the following commit in https://android.googlesource.com/platform/sdk.git : 182e469 emulator/opengl: Fix Windows cross-build. Change-Id: If2010577ef4af4c6755ab345f424af0b546f9282 --- .../Translator/include/EGL/eglinternalplatform.h | 69 ---------------------- 1 file changed, 69 deletions(-) delete mode 100644 emulator/opengl/host/libs/Translator/include/EGL/eglinternalplatform.h (limited to 'emulator/opengl/host/libs/Translator/include/EGL/eglinternalplatform.h') diff --git a/emulator/opengl/host/libs/Translator/include/EGL/eglinternalplatform.h b/emulator/opengl/host/libs/Translator/include/EGL/eglinternalplatform.h deleted file mode 100644 index 953284ac2..000000000 --- a/emulator/opengl/host/libs/Translator/include/EGL/eglinternalplatform.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -* Copyright 2011 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 EGL_INTERNAL_PLATFORM_H -#define EGL_INTERNAL_PLATFORM_H - -class SrfcInfo; //defined in Egl{$platform}Api.cpp -typedef SrfcInfo* SURFACE; -typedef SURFACE EGLNativeSurfaceType; - -#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif - -#include -#define WGL_WGLEXT_PROTOTYPES -#include - -class WinDisplay; //defined in EglWindows.cpp -typedef WinDisplay* DISPLAY; - -typedef PIXELFORMATDESCRIPTOR EGLNativePixelFormatType; -#define PIXEL_FORMAT_INITIALIZER {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; -typedef HGLRC EGLNativeContextType; -typedef HPBUFFERARB EGLNativePbufferType; -typedef DISPLAY EGLNativeInternalDisplayType; - -#elif defined(__APPLE__) - -typedef void* EGLNativePixelFormatType; -#define PIXEL_FORMAT_INITIALIZER NULL -typedef void* EGLNativeContextType; -typedef void* EGLNativePbufferType; -typedef EGLNativeDisplayType EGLNativeInternalDisplayType; - - -#elif defined(__unix__) - -/* X11 (tentative) */ -#include -#include -#include - -typedef GLXFBConfig EGLNativePixelFormatType; -#define PIXEL_FORMAT_INITIALIZER 0; -typedef GLXContext EGLNativeContextType; -typedef GLXPbuffer EGLNativePbufferType; -typedef EGLNativeDisplayType EGLNativeInternalDisplayType; - -#else -#error "Platform not recognized" -#endif - - -#endif -- cgit v1.2.3