From 0db9dae2159eb7f6579a5a152df742e5e980b911 Mon Sep 17 00:00:00 2001
From: Amit Feller <amit@graphtech.co.il>
Date: Mon, 30 May 2011 16:34:06 +0300
Subject: [PATCH] opengl translator: moved some types out of eglplatform.h

Some native types like NativeFBConfig and NativeContext are
internal to the translator implementation and should not
exist in the interface headers.
Moved those types from eglplatform.h into eglinternalplatfom.h

Change-Id: I6462a007de8c185deecbb9beebc343ca3626fd0c
---
 .../host/libs/Translator/EGL/EglConfig.h      |  1 +
 .../host/libs/Translator/EGL/EglOsApi.h       |  1 +
 .../include/EGL/eglinternalplatform.h         | 59 +++++++++++++++++++
 .../libs/Translator/include/EGL/eglplatform.h | 16 -----
 4 files changed, 61 insertions(+), 16 deletions(-)
 create mode 100644 tools/emulator/opengl/host/libs/Translator/include/EGL/eglinternalplatform.h

diff --git a/tools/emulator/opengl/host/libs/Translator/EGL/EglConfig.h b/tools/emulator/opengl/host/libs/Translator/EGL/EglConfig.h
index e45681bee..3336f0e67 100644
--- a/tools/emulator/opengl/host/libs/Translator/EGL/EglConfig.h
+++ b/tools/emulator/opengl/host/libs/Translator/EGL/EglConfig.h
@@ -17,6 +17,7 @@
 #define EGL_CONFIG_H
 
 #include<EGL/egl.h>
+#include<EGL/eglinternalplatform.h>
 
 #define MIN_SWAP_INTERVAL 1
 #define MAX_SWAP_INTERVAL 10
diff --git a/tools/emulator/opengl/host/libs/Translator/EGL/EglOsApi.h b/tools/emulator/opengl/host/libs/Translator/EGL/EglOsApi.h
index 3e00c58c2..33813ab70 100644
--- a/tools/emulator/opengl/host/libs/Translator/EGL/EglOsApi.h
+++ b/tools/emulator/opengl/host/libs/Translator/EGL/EglOsApi.h
@@ -17,6 +17,7 @@
 #define EGL_OS_API_H
 
 #include <EGL/egl.h>
+#include <EGL/eglinternalplatform.h>
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #else
diff --git a/tools/emulator/opengl/host/libs/Translator/include/EGL/eglinternalplatform.h b/tools/emulator/opengl/host/libs/Translator/include/EGL/eglinternalplatform.h
new file mode 100644
index 000000000..3137027c6
--- /dev/null
+++ b/tools/emulator/opengl/host/libs/Translator/include/EGL/eglinternalplatform.h
@@ -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
diff --git a/tools/emulator/opengl/host/libs/Translator/include/EGL/eglplatform.h b/tools/emulator/opengl/host/libs/Translator/include/EGL/eglplatform.h
index a85eea7b6..95aaa22f0 100644
--- a/tools/emulator/opengl/host/libs/Translator/include/EGL/eglplatform.h
+++ b/tools/emulator/opengl/host/libs/Translator/include/EGL/eglplatform.h
@@ -65,28 +65,17 @@
 #define WIN32_LEAN_AND_MEAN 1
 #endif
 #include <windows.h>
-#include <GL/gl.h>
-#define WGL_WGLEXT_PROTOTYPES
-#include <GL/wglext.h>
 
 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                EGLNativeDisplayType;
 typedef HBITMAP                EGLNativePixmapType;
 typedef HWND                   EGLNativeWindowType;
 
 #elif defined(__APPLE__)
 
-typedef void*                  EGLNativePixelFormatType;
-#define PIXEL_FORMAT_INITIALIZER NULL
-typedef void*                  EGLNativeContextType;
-typedef void*                  EGLNativePbufferType;
 typedef unsigned int           EGLNativeDisplayType;
 typedef void*                  EGLNativePixmapType;
 typedef void*                  EGLNativeWindowType;
@@ -95,14 +84,9 @@ typedef void*                  EGLNativeWindowType;
 #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;
 typedef Display *           EGLNativeDisplayType;
 typedef Pixmap              EGLNativePixmapType;
 typedef Window              EGLNativeWindowType;