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

Moved defined into GLDefines header to avoid compile issues under Windows

Browse Source
This commit is contained in:
Robert Osfield 2018-01-15 16:02:44 +00:00
parent bf6aaed5e0
commit 5ad1a652a0
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/osg/GLDefines
View File

@ -646,6 +646,19 @@ typedef char GLchar;
#define GL_MAX_3D_TEXTURE_SIZE 0x8073 #define GL_MAX_3D_TEXTURE_SIZE 0x8073
#endif #endif
#ifndef GL_TEXTURE_MIN_LOD
#define GL_TEXTURE_MIN_LOD 0x813A
#endif
#ifndef GL_TEXTURE_MAX_LOD
#define GL_TEXTURE_MAX_LOD 0x813B
#endif
#ifndef GL_TEXTURE_LOD_BIAS
#define GL_TEXTURE_LOD_BIAS 0x8501
#endif
#ifndef GL_INTERLEAVED_ATTRIBS #ifndef GL_INTERLEAVED_ATTRIBS
#define GL_INTERLEAVED_ATTRIBS 0x8C8C #define GL_INTERLEAVED_ATTRIBS 0x8C8C
#endif #endif

11
src/osg/Sampler.cpp
View File

@ -15,13 +15,6 @@
#include <osg/Sampler> #include <osg/Sampler>
#include <osg/Texture3D> #include <osg/Texture3D>
#ifndef GL_TEXTURE_MIN_LOD
#define GL_TEXTURE_MIN_LOD 0x813A
#endif
#ifndef GL_TEXTURE_MAX_LOD
#define GL_TEXTURE_MAX_LOD 0x813B
#endif
#ifndef GL_TEXTURE_WRAP_R #ifndef GL_TEXTURE_WRAP_R
#define GL_TEXTURE_WRAP_R 0x2804 #define GL_TEXTURE_WRAP_R 0x2804
@ -35,10 +28,6 @@
#define GL_TEXTURE_COMPARE_FUNC 0x884D #define GL_TEXTURE_COMPARE_FUNC 0x884D
#endif #endif
#ifndef GL_TEXTURE_LOD_BIAS
#define GL_TEXTURE_LOD_BIAS 0x8501
#endif
using namespace osg; using namespace osg;