From 60457486b08796f1378cff3656a2fcfdd8ac9ef5 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 30 Nov 2010 08:12:06 +0000 Subject: [PATCH] From Wang Rui, Compile fixes --- include/osg/BufferIndexBinding | 5 +++++ include/osg/BufferObject | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/osg/BufferIndexBinding b/include/osg/BufferIndexBinding index 2e9e1273b..c073ecd2e 100644 --- a/include/osg/BufferIndexBinding +++ b/include/osg/BufferIndexBinding @@ -14,10 +14,15 @@ #ifndef OSG_BUFFERINDEXBINDING #define OSG_BUFFERINDEXBINDING 1 + #include #include #include +#ifndef GL_TRANSFORM_FEEDBACK_BUFFER + #define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E +#endif + namespace osg { class State; diff --git a/include/osg/BufferObject b/include/osg/BufferObject index 563598275..2632e3cbf 100644 --- a/include/osg/BufferObject +++ b/include/osg/BufferObject @@ -73,6 +73,17 @@ #endif #ifndef GL_VERSION_1_5 + #if defined(_WIN64) + typedef __int64 GLintptr; + typedef __int64 GLsizeiptr; + #elif defined(__ia64__) || defined(__x86_64__) + typedef long int GLintptr; + typedef long int GLsizeiptr; + #else + typedef int GLintptr; + typedef int GLsizeiptr; + #endif + #define GL_STREAM_DRAW 0x88E0 #define GL_STREAM_READ 0x88E1 #define GL_STREAM_COPY 0x88E2