[Bf-committers] Game engine: ATI vs. Irix

[Chris Want]

This is a multi-part message in MIME format.
--------------070703010904070306080609
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit


I guess this is directed mainly at Kester:

It appears that GL_ATI_pn_triangles gets defined
on Irix, but PFNGLPNTRIANGLESIATIPROC doesn't.
The attached patch enables the gamengine to build
on Irix.

Chris


--------------070703010904070306080609
Content-Type: text/x-patch;
 name="ati.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="ati.diff"

Index: source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp,v
retrieving revision 1.5
diff -u -p -r1.5 RAS_GLExtensionManager.cpp
--- source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp	7 Jun 2004 11:01:31 -0000	1.5
+++ source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp	22 Jun 2004 03:54:00 -0000
@@ -311,7 +311,7 @@ to their source.  Cunning like a weasel.
 
  ******************************************************************************/
 
-#if defined(GL_ATI_pn_triangles)
+#if defined(PFNGLPNTRIANGLESIATIPROC)
 PFNGLPNTRIANGLESIATIPROC glPNTrianglesiATI;
 PFNGLPNTRIANGLESFATIPROC glPNTrianglesfATI;
 #endif
@@ -335,7 +335,7 @@ static void LinkExtensions()
 	static bool doDebugMessages = m_debug;
 	extensions = STR_String((const char *) glGetString(GL_EXTENSIONS)).Explode(' ');
 
-#if defined(GL_ATI_pn_triangles)
+#if defined(PFNGLPNTRIANGLESIATIPROC)
 	if (QueryExtension("GL_ATI_pn_triangles"))
 	{
 		glPNTrianglesiATI = reinterpret_cast<PFNGLPNTRIANGLESIATIPROC>(bglGetProcAddress((const GLubyte *) "glPNTrianglesiATI"));
Index: source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h,v
retrieving revision 1.4
diff -u -p -r1.4 RAS_GLExtensionManager.h
--- source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h	7 Jun 2004 11:01:31 -0000	1.4
+++ source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h	22 Jun 2004 03:54:00 -0000
@@ -364,7 +364,7 @@ namespace bgl
 	 */
 	void InitExtensions(int debug);
 
-#if defined(GL_ATI_pn_triangles)
+#if defined(PFNGLPNTRIANGLESIATIPROC)
 extern PFNGLPNTRIANGLESIATIPROC glPNTrianglesiATI;
 extern PFNGLPNTRIANGLESFATIPROC glPNTrianglesfATI;
 #endif

--------------070703010904070306080609--