Renamed the new include/osg/OpenGL automatically configured header file to include/osg/GL replacing the original hand built GL header
This commit is contained in:
Robert Osfield
@@ -605,8 +605,8 @@ SET(OPENSCENEGRAPH_CONFIG_HEADER "${PROJECT_BINARY_DIR}/include/osg/Config")
|
||||
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/Config.in"
|
||||
"${OPENSCENEGRAPH_CONFIG_HEADER}")
|
||||
|
||||
SET(OPENSCENEGRAPH_OPENGL_HEADER "${PROJECT_BINARY_DIR}/include/osg/OpenGL")
|
||||
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/OpenGL.in"
|
||||
SET(OPENSCENEGRAPH_OPENGL_HEADER "${PROJECT_BINARY_DIR}/include/osg/GL")
|
||||
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/src/osg/GL.in"
|
||||
"${OPENSCENEGRAPH_OPENGL_HEADER}")
|
||||
|
||||
# INSTALL_FILES(/include/osg/ FILES "${OPENSCENEGRAPH_CONFIG_HEADER}")
|
||||
|
||||
257
include/osg/GL
257
include/osg/GL
@@ -1,257 +0,0 @@
|
||||
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
|
||||
*
|
||||
* This library is open source and may be redistributed and/or modified under
|
||||
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
|
||||
* (at your option) any later version. The full license is in LICENSE file
|
||||
* included with this distribution, and on the openscenegraph.org website.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* OpenSceneGraph Public License for more details.
|
||||
*/
|
||||
|
||||
#ifndef OSG_GL
|
||||
#define OSG_GL 1
|
||||
|
||||
#if 1
|
||||
|
||||
#include <osg/OpenGL>
|
||||
|
||||
#else
|
||||
|
||||
|
||||
#include <osg/Config>
|
||||
#include <osg/Export>
|
||||
|
||||
|
||||
#if defined(OSG_GLES1_AVAILABLE)
|
||||
|
||||
#ifdef __APPLE__
|
||||
//if its apple include the target defines so we can check for IOS
|
||||
#include "TargetConditionals.h"
|
||||
#include <OpenGLES/ES1/gl.h>
|
||||
#else
|
||||
#include <GLES/gl.h>
|
||||
#endif
|
||||
|
||||
#elif defined(OSG_GLES2_AVAILABLE)
|
||||
|
||||
#ifdef __APPLE__
|
||||
//if its apple include the target defines so we can check for IOS
|
||||
#include "TargetConditionals.h"
|
||||
#include <OpenGLES/ES2/gl.h>
|
||||
#else
|
||||
#include <GLES2/gl2.h>
|
||||
#endif
|
||||
|
||||
|
||||
#else
|
||||
|
||||
#ifndef WIN32
|
||||
|
||||
// Required for compatibility with glext.h sytle function definitions of
|
||||
// OpenGL extensions, such as in src/osg/Point.cpp.
|
||||
#ifndef APIENTRY
|
||||
#define APIENTRY
|
||||
#endif
|
||||
|
||||
#else // WIN32
|
||||
|
||||
#if defined(__CYGWIN__) || defined(__MINGW32__)
|
||||
|
||||
#ifndef APIENTRY
|
||||
#define GLUT_APIENTRY_DEFINED
|
||||
#define APIENTRY __stdcall
|
||||
#endif
|
||||
// XXX This is from Win32's <windef.h>
|
||||
#ifndef CALLBACK
|
||||
#define CALLBACK __stdcall
|
||||
#endif
|
||||
|
||||
#else // ! __CYGWIN__
|
||||
|
||||
// Under Windows avoid including <windows.h>
|
||||
// to avoid name space pollution, but Win32's <GL/gl.h>
|
||||
// needs APIENTRY and WINGDIAPI defined properly.
|
||||
// XXX This is from Win32's <windef.h>
|
||||
#ifndef APIENTRY
|
||||
#define GLUT_APIENTRY_DEFINED
|
||||
#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
|
||||
#define WINAPI __stdcall
|
||||
#define APIENTRY WINAPI
|
||||
#else
|
||||
#define APIENTRY
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// XXX This is from Win32's <windef.h>
|
||||
#ifndef CALLBACK
|
||||
#if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED)
|
||||
#define CALLBACK __stdcall
|
||||
#else
|
||||
#define CALLBACK
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif // __CYGWIN__
|
||||
|
||||
// XXX This is from Win32's <wingdi.h> and <winnt.h>
|
||||
#ifndef WINGDIAPI
|
||||
#define GLUT_WINGDIAPI_DEFINED
|
||||
#define DECLSPEC_IMPORT __declspec(dllimport)
|
||||
#define WINGDIAPI DECLSPEC_IMPORT
|
||||
#endif
|
||||
|
||||
// XXX This is from Win32's <ctype.h>
|
||||
#if !defined(_WCHAR_T_DEFINED) && !(defined(__GNUC__)&&((__GNUC__ == 3)||(__GNUC__ == 4)))
|
||||
typedef unsigned short wchar_t;
|
||||
#define _WCHAR_T_DEFINED
|
||||
#endif
|
||||
|
||||
#endif // WIN32
|
||||
|
||||
#if defined(OSG_GL3_AVAILABLE)
|
||||
|
||||
#define GL3_PROTOTYPES 1
|
||||
#ifdef __APPLE__
|
||||
#include <OpenGL/OpenGL.h>
|
||||
#include <OpenGL/gl3.h>
|
||||
#else
|
||||
#include <GL3/gl3.h>
|
||||
#endif
|
||||
#define GLint64EXT GLint64
|
||||
#define GLuint64EXT GLuint64
|
||||
#define GL_BGRA_EXT GL_BGRA
|
||||
|
||||
#else
|
||||
#ifndef __gl_h_
|
||||
#ifdef __APPLE__
|
||||
#include <OpenGL/gl.h>
|
||||
#else
|
||||
#include <GL/gl.h>
|
||||
|
||||
// hack required to avoid conflicts with Qt
|
||||
// Qt expects GLdouble to be a macro ?!
|
||||
#ifndef GLdouble
|
||||
#define GLdouble double
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef GL_APIENTRY
|
||||
#define GL_APIENTRY APIENTRY
|
||||
#endif // GL_APIENTRY
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#if !defined(GL_EXT_timer_query) && !defined(OSG_GL3_AVAILABLE)
|
||||
|
||||
#ifdef _WIN32
|
||||
typedef __int64 GLint64EXT;
|
||||
typedef unsigned __int64 GLuint64EXT;
|
||||
#else
|
||||
typedef long long int GLint64EXT;
|
||||
typedef unsigned long long int GLuint64EXT;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef OSG_GL_MATRICES_AVAILABLE
|
||||
|
||||
inline void glLoadMatrix(const float* mat) { glLoadMatrixf(static_cast<const GLfloat*>(mat)); }
|
||||
inline void glMultMatrix(const float* mat) { glMultMatrixf(static_cast<const GLfloat*>(mat)); }
|
||||
|
||||
#ifdef OSG_GLES1_AVAILABLE
|
||||
inline void glLoadMatrix(const double* mat)
|
||||
{
|
||||
GLfloat flt_mat[16];
|
||||
for(unsigned int i=0;i<16;++i) flt_mat[i] = mat[i];
|
||||
glLoadMatrixf(flt_mat);
|
||||
}
|
||||
|
||||
inline void glMultMatrix(const double* mat)
|
||||
{
|
||||
GLfloat flt_mat[16];
|
||||
for(unsigned int i=0;i<16;++i) flt_mat[i] = mat[i];
|
||||
glMultMatrixf(flt_mat);
|
||||
}
|
||||
|
||||
#else
|
||||
inline void glLoadMatrix(const double* mat) { glLoadMatrixd(static_cast<const GLdouble*>(mat)); }
|
||||
inline void glMultMatrix(const double* mat) { glMultMatrixd(static_cast<const GLdouble*>(mat)); }
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// add defines for OpenGL targets that don't define them, just to ease compatibility across targets
|
||||
#ifndef GL_DOUBLE
|
||||
#define GL_DOUBLE 0x140A
|
||||
typedef double GLdouble;
|
||||
#endif
|
||||
|
||||
#ifndef GL_INT
|
||||
#define GL_INT 0x1404
|
||||
#endif
|
||||
|
||||
#ifndef GL_UNSIGNED_INT
|
||||
#define GL_UNSIGNED_INT 0x1405
|
||||
#endif
|
||||
|
||||
#ifndef GL_NONE
|
||||
// OpenGL ES1 doesn't provide GL_NONE
|
||||
#define GL_NONE 0x0
|
||||
#endif
|
||||
|
||||
#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
|
||||
//GLES defines (OES)
|
||||
#define GL_RGB8_OES 0x8051
|
||||
#define GL_RGBA8_OES 0x8058
|
||||
#endif
|
||||
|
||||
#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) || defined(OSG_GL3_AVAILABLE)
|
||||
#define GL_POLYGON 0x0009
|
||||
#define GL_QUADS 0x0007
|
||||
#define GL_QUAD_STRIP 0x0008
|
||||
#endif
|
||||
|
||||
#if defined(OSG_GL3_AVAILABLE)
|
||||
#define GL_LUMINANCE 0x1909
|
||||
#define GL_LUMINANCE_ALPHA 0x190A
|
||||
#endif
|
||||
|
||||
#ifdef OSG_GL1_AVAILABLE
|
||||
#define OSG_GL1_FEATURES true
|
||||
#else
|
||||
#define OSG_GL1_FEATURES false
|
||||
#endif
|
||||
|
||||
#ifdef OSG_GL2_AVAILABLE
|
||||
#define OSG_GL2_FEATURES true
|
||||
#else
|
||||
#define OSG_GL2_FEATURES false
|
||||
#endif
|
||||
|
||||
#ifdef OSG_GL3_AVAILABLE
|
||||
#define OSG_GL3_FEATURES true
|
||||
#else
|
||||
#define OSG_GL3_FEATURES false
|
||||
#endif
|
||||
|
||||
#ifdef OSG_GLES1_AVAILABLE
|
||||
#define OSG_GLES1_FEATURES true
|
||||
#else
|
||||
#define OSG_GLES1_FEATURES false
|
||||
#endif
|
||||
|
||||
#ifdef OSG_GLES2_AVAILABLE
|
||||
#define OSG_GLES2_FEATURES true
|
||||
#else
|
||||
#define OSG_GLES2_FEATURES false
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
#endif // __osgGL_h
|
||||
@@ -71,7 +71,6 @@ SET(TARGET_H
|
||||
${HEADER_PATH}/FrontFace
|
||||
${HEADER_PATH}/Geode
|
||||
${HEADER_PATH}/Geometry
|
||||
${HEADER_PATH}/GL
|
||||
${HEADER_PATH}/GL2Extensions
|
||||
${HEADER_PATH}/GLExtensions
|
||||
${HEADER_PATH}/GLBeginEndAdapter
|
||||
|
||||
Reference in New Issue
Block a user