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

Windows build fixes

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14590 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2014-12-09 20:09:29 +00:00
parent a6aa47afcd
commit 22e51c9902
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/osg/GL2Extensions
View File

@ -552,6 +552,24 @@ typedef char GLchar;
#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull #define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull
#endif #endif
#ifndef GL_TEXTURE_2D_ARRAY_EXT
#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A
#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A
#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B
#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D
#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF
#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1
#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4
#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
#endif
#ifndef GL_MAX_3D_TEXTURE_SIZE
#define GL_MAX_3D_TEXTURE_SIZE 0x8073
#endif
typedef struct __GLsync *GLsync;
// for compatibility with gl.h headers that don't support VBO, // for compatibility with gl.h headers that don't support VBO,
//GL_VERSION_1_5 and GL_ARB_vertex_buffer_object provide these types for OpenGL //GL_VERSION_1_5 and GL_ARB_vertex_buffer_object provide these types for OpenGL
//all ES versions except GL_OES_VERSION_1_0 provide these types for OpenGL ES //all ES versions except GL_OES_VERSION_1_0 provide these types for OpenGL ES

2
include/osg/GraphicsContext
View File

@ -541,8 +541,6 @@ public:
virtual void swapBuffersImplementation(GraphicsContext* gc); virtual void swapBuffersImplementation(GraphicsContext* gc);
typedef struct __GLsync *GLsync;
GLsync _previousSync; GLsync _previousSync;
}; };

11
include/osg/Texture
View File

@ -188,17 +188,6 @@
#define GL_TEXTURE_3D 0x806F #define GL_TEXTURE_3D 0x806F
#endif #endif
#ifndef GL_TEXTURE_2D_ARRAY_EXT
#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A
#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A
#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B
#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D
#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF
#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1
#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4
#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
#endif
#ifndef GL_TEXTURE_CUBE_MAP #ifndef GL_TEXTURE_CUBE_MAP
#define GL_TEXTURE_CUBE_MAP 0x8513 #define GL_TEXTURE_CUBE_MAP 0x8513

4
include/osg/Texture3D
View File

@ -16,10 +16,6 @@
#include <osg/Texture> #include <osg/Texture>
#ifndef GL_MAX_3D_TEXTURE_SIZE
#define GL_MAX_3D_TEXTURE_SIZE 0x8073
#endif
namespace osg { namespace osg {
/** Encapsulates OpenGL 3D texture functionality. Doesn't support cube maps, /** Encapsulates OpenGL 3D texture functionality. Doesn't support cube maps,

2
src/osg/Texture.cpp
View File

@ -2695,7 +2695,7 @@ Texture::GenerateMipmapMode Texture::mipmapBeforeTexImage(const State& state, bo
#else #else
const GL2Extensions* extensions = state.get<GL2Extensions>(); const GL2Extensions* extensions = state.get<GL2Extensions>();
bool useGenerateMipMap = extensions->glGenerateMipmap; bool useGenerateMipMap = extensions->glGenerateMipmap!=0;
if (useGenerateMipMap) if (useGenerateMipMap)
{ {