LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "opengl translator: moved some types out of eglplatform.h"

Browse Source
This commit is contained in:
David Turner
2011-06-07 01:40:48 -07:00
committed by Android Code Review
parent 8a96cb7e8b 0db9dae215
commit cc3b388746
4 changed files with 61 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/emulator/opengl/host/libs/Translator/EGL/EglConfig.h
View File

@@ -17,6 +17,7 @@
#define EGL_CONFIG_H #define EGL_CONFIG_H
#include<EGL/egl.h> #include<EGL/egl.h>
#include<EGL/eglinternalplatform.h>
#define MIN_SWAP_INTERVAL 1 #define MIN_SWAP_INTERVAL 1
#define MAX_SWAP_INTERVAL 10 #define MAX_SWAP_INTERVAL 10

1
tools/emulator/opengl/host/libs/Translator/EGL/EglOsApi.h
View File

@@ -17,6 +17,7 @@
#define EGL_OS_API_H #define EGL_OS_API_H
#include <EGL/egl.h> #include <EGL/egl.h>
#include <EGL/eglinternalplatform.h>
#ifdef __APPLE__ #ifdef __APPLE__
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#else #else

59
tools/emulator/opengl/host/libs/Translator/include/EGL/eglinternalplatform.h Normal file
View File

@@ -0,0 +1,59 @@
#ifndef EGL_INTERNAL_PLATFORM_H
#define EGL_INTERNAL_PLATFORM_H
/*
* Copyright (C) 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.
*/
#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 <GL/gl.h>
#define WGL_WGLEXT_PROTOTYPES
#include <GL/wglext.h>
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;
#elif defined(__APPLE__)
typedef void* EGLNativePixelFormatType;
#define PIXEL_FORMAT_INITIALIZER NULL
typedef void* EGLNativeContextType;
typedef void* EGLNativePbufferType;
#elif defined(__unix__)
/* X11 (tentative) */
#include <GL/glx.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
typedef GLXFBConfig EGLNativePixelFormatType;
#define PIXEL_FORMAT_INITIALIZER 0;
typedef GLXContext EGLNativeContextType;
typedef GLXPbuffer EGLNativePbufferType;
#else
#error "Platform not recognized"
#endif
#endif

16
tools/emulator/opengl/host/libs/Translator/include/EGL/eglplatform.h
View File

@@ -65,28 +65,17 @@
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#endif #endif
#include <windows.h> #include <windows.h>
#include <GL/gl.h>
#define WGL_WGLEXT_PROTOTYPES
#include <GL/wglext.h>
class WinDisplay; //defined in EglWindows.cpp class WinDisplay; //defined in EglWindows.cpp
typedef WinDisplay* DISPLAY; 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 EGLNativeDisplayType; typedef DISPLAY EGLNativeDisplayType;
typedef HBITMAP EGLNativePixmapType; typedef HBITMAP EGLNativePixmapType;
typedef HWND EGLNativeWindowType; typedef HWND EGLNativeWindowType;
#elif defined(__APPLE__) #elif defined(__APPLE__)
typedef void* EGLNativePixelFormatType;
#define PIXEL_FORMAT_INITIALIZER NULL
typedef void* EGLNativeContextType;
typedef void* EGLNativePbufferType;
typedef unsigned int EGLNativeDisplayType; typedef unsigned int EGLNativeDisplayType;
typedef void* EGLNativePixmapType; typedef void* EGLNativePixmapType;
typedef void* EGLNativeWindowType; typedef void* EGLNativeWindowType;
@@ -95,14 +84,9 @@ typedef void* EGLNativeWindowType;
#elif defined(__unix__) #elif defined(__unix__)
/* X11 (tentative) */ /* X11 (tentative) */
#include <GL/glx.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
typedef GLXFBConfig EGLNativePixelFormatType;
#define PIXEL_FORMAT_INITIALIZER 0;
typedef GLXContext EGLNativeContextType;
typedef GLXPbuffer EGLNativePbufferType;
typedef Display * EGLNativeDisplayType; typedef Display * EGLNativeDisplayType;
typedef Pixmap EGLNativePixmapType; typedef Pixmap EGLNativePixmapType;
typedef Window EGLNativeWindowType; typedef Window EGLNativeWindowType;