From 523e6f6769838c76ec16f95b017a989e8b35c23f Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Wed, 2 Nov 2011 18:47:23 +0800 Subject: [PATCH] egl: Add eglimports.hpp This header file is included by glimports.hpp. It is made a separate file file so that we can add the (messy) GLES includes to it later without complicating glimports.hpp. --- CMakeLists.txt | 2 ++ eglimports.hpp | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ glimports.hpp | 3 +++ 3 files changed, 70 insertions(+) create mode 100644 eglimports.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 72b35c2..b206822 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -179,6 +179,8 @@ endif () # For glext headers include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) +# For EGL headers +include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khr) ############################################################################## # Installation directories diff --git a/eglimports.hpp b/eglimports.hpp new file mode 100644 index 0000000..a6d53cc --- /dev/null +++ b/eglimports.hpp @@ -0,0 +1,65 @@ +/************************************************************************** + * + * Copyright 2011 LunarG, Inc. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + **************************************************************************/ + +/* + * Central place for all EGL and client API includes. It can be included + * directly, or indirectly through glimports.h. + */ + +#ifndef _EGLIMPORTS_HPP_ +#define _EGLIMPORTS_HPP_ + + +// OpenGL +#ifndef __gl_h_ + +// Prevent including system's glext.h +#define __glext_h_ + +#include + +// Include our own glext.h +#undef __glext_h_ +#include "glext/glext.h" + +#ifndef GL_TEXTURE_INDEX_SIZE_EXT +#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED +#endif + +#endif /* __gl_h_ */ + + +#ifdef HAVE_EGL + +// EGL +#include "EGL/egl.h" +#include "EGL/eglext.h" +/* Prevent collision with Trace::Bool */ +#undef Bool + +#endif /* HAVE_EGL */ + + +#endif /* _EGLIMPORTS_HPP_ */ diff --git a/glimports.hpp b/glimports.hpp index b5cdb4b..d0dc0da 100644 --- a/glimports.hpp +++ b/glimports.hpp @@ -137,4 +137,7 @@ CGLError CGLUpdateContext(CGLContextObj ctx); #endif +#include "eglimports.hpp" + + #endif /* _GLIMPORTS_HPP_ */ -- 2.7.4