FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fixes when compiling wuth CMake options OPENGL_PROFILE set to GLCORE

Browse Source
This commit is contained in:
Robert Osfield
2016-08-08 15:08:07 +01:00
parent 46c86f53ac
commit 1d75089bf8
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/GLDefines
View File

@@ -45,8 +45,10 @@
typedef char GLchar;
#endif
#if !defined(GL_VERSION_2_0)
#if !defined(GL_VERTEX_PROGRAM_POINT_SIZE)
#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642
#endif
#if !defined(GL_VERTEX_PROGRAM_TWO_SIDE)
#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643
#endif
@@ -615,13 +617,13 @@ namespace osg
//all ES versions except GL_OES_VERSION_1_0 provide these types for OpenGL ES
#if !defined(GL_VERSION_1_5) && !defined(GL_ARB_vertex_buffer_object) \
&& !defined(GL_ES_VERSION_2_0) && !defined(OPENGLES_1_1_FOUND)
#if 1
// experimental defination.
typedef ptrdiff_t GLsizeiptr;
typedef ptrdiff_t GLintptr;
#else
#if defined(_WIN64)
typedef __int64 GLintptr;
typedef __int64 GLsizeiptr;