diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-01-10 09:34:42 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-01-10 09:34:42 +0300 |
| commit | b7be6620d6ecfbec1d82128f402b585041910ca9 (patch) | |
| tree | c43c034f4f9b79a46d68b6fe191f2b0644aad494 /source/gameengine/Rasterizer/RAS_OpenGLRasterizer | |
| parent | 95355efec9406b6681c3f1b7852712349ad82dd9 (diff) | |
applied patch from snailrose, related to multi-platform OpenGL extensions.
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_OpenGLRasterizer')
3 files changed, 16 insertions, 23 deletions
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h index a3031512049..2a760b09f5e 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h @@ -2,24 +2,6 @@ #define __ARB_MULTITEXTURE_H__ /* - make sure glext is included before this, when setting up extensions - -should we try for this? -... -#include ("glext.h" or "SDL_opengl.h"(will need SDL-1.2.9)) -... -#define BGL_MultiTexture -#ifdef GL_VERSION_1_3 // in core - #define BGL_TEXTURE0 // GL_TEXTURE0 - #define bglActiveTexture(unit) bgl::glActiveTexture(unit) - // ... -#elif GL_ARB_multitexture // GL < 1_3 use extension - #define BGL_TEXTURE0 // GL_TEXTURE0_ARB - #define bglActiveTexture(unit) bgl::glActiveTextureARB(unit) - // ... -#else // cant do it, skip - #undef BGL_MultiTexture -#endif */ /* ---------------------------------------------------------------------------- diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h index f91b50e39bf..2d862ea3853 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h @@ -33,11 +33,22 @@ #define __RAS_GLEXTENSIONMANAGER_H__ +#ifdef WIN32 +# include <windows.h> +# include <GL/gl.h> -#ifdef __APPLE__ -#include <OpenGL/gl.h> -#else -#include <GL/gl.h> +#elif defined(__APPLE__) +# define __glext_h_ +# include <OpenGL/gl.h> +# include <OpenGL/glu.h> +# undef __glext_h_ + +#else /* UNIX */ +# define __glext_h_ +# include <GL/gl.h> +# include <GL/glx.h> +# undef GL_ARB_multitexture // (ubuntu) +# undef __glext_h_ #endif #include "glext.h" diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index fa507b85b1b..7a140fd0f7e 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -432,7 +432,7 @@ void RAS_OpenGLRasterizer::ClearCachingInfo(void) void RAS_OpenGLRasterizer::EndFrame() { glDisable(GL_LIGHTING); - glDisable(GL_TEXTURE); + glDisable(GL_TEXTURE_2D); //DrawDebugLines glBegin(GL_LINES); |