diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-01-07 03:14:37 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-01-07 03:14:37 +0300 |
| commit | bed24bc299616f8ee05762a15d083b56df6b3450 (patch) | |
| tree | 1f0438f43fa6ad1120dfe3e1b6b21d7762efa2dc /source/gameengine/Rasterizer | |
| parent | 524ea29aaa77922ff123b04deaabed19517214e7 (diff) | |
more work to get armatures/blender materials to work under non-windows platforms
Diffstat (limited to 'source/gameengine/Rasterizer')
3 files changed, 7 insertions, 8 deletions
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h index 0c68673ffb3..0730c632b82 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/ARB_multitexture.h @@ -11,9 +11,7 @@ GL_ARB_multitexture ---------------------------------------------------------------------------- */ #ifndef GL_ARB_multitexture -#ifdef WIN32 #define GL_ARB_multitexture 1 -#endif //WIN32 #endif #ifdef GL_ARB_multitexture diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp index 71b68815c15..dee75662236 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp @@ -322,7 +322,6 @@ BL_EXTInfo RAS_EXT_support; #if defined(GL_ARB_multitexture) int max_texture_units = 2; - PFNGLACTIVETEXTUREARBPROC glActiveTextureARB; PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB; PFNGLMULTITEXCOORD1DARBPROC glMultiTexCoord1dARB; @@ -466,10 +465,12 @@ static void LinkExtensions() } #endif +#ifdef WIN32 #ifdef GL_ARB_multitexture if (QueryExtension("GL_ARB_multitexture")) { - glActiveTextureARB = reinterpret_cast<PFNGLACTIVETEXTUREARBPROC>(bglGetProcAddress((const GLubyte *) "glActiveTextureARB")); + void* ptr=0; + glActiveTextureARB = reinterpret_cast<PFNGLACTIVETEXTUREARBPROC>(ptr);//bglGetProcAddress((const GLubyte *) "glActiveTextureARB")); glClientActiveTextureARB = reinterpret_cast<PFNGLCLIENTACTIVETEXTUREARBPROC>(bglGetProcAddress((const GLubyte *) "glClientActiveTextureARB")); glMultiTexCoord1dARB = reinterpret_cast<PFNGLMULTITEXCOORD1DARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord1dARB")); glMultiTexCoord1dvARB = reinterpret_cast<PFNGLMULTITEXCOORD1DVARBPROC>(bglGetProcAddress((const GLubyte *) "glMultiTexCoord1dvARB")); @@ -513,9 +514,9 @@ static void LinkExtensions() } } #endif +#endif// WIN32 - - +#ifdef WIN32 #ifdef GL_EXT_blend_color if (QueryExtension("GL_EXT_blend_color")) { @@ -530,7 +531,7 @@ static void LinkExtensions() } } #endif - +#endif #ifdef GL_ARB_shader_objects if (QueryExtension("GL_ARB_shader_objects")) { diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h index 119eda3b5bb..5009691d3f5 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h @@ -44,7 +44,6 @@ #include "EXT_separate_specular_color.h" #include "ARB_multitexture.h" - namespace bgl { /** @@ -409,6 +408,7 @@ extern PFNGLBLENDCOLOREXTPROC glBlendColorEXT; #endif #ifdef GL_ARB_multitexture + extern int max_texture_units; typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture); typedef void (APIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); |