Attachment 2340 Details for Bug 12085 – glaxium-0.5-glx.patch

[patch] glaxium-0.5-glx.patch

glaxium-0.5-glx.patch (text/plain), 1.97 KB, created by Michael Shigorin on 2007-12-26 22:27:54 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2007-12-26 22:27:54 MSK

Size: 1.97 KB

patch

obsolete

>--- glaxium_0.5/myship.cpp.orig	2002-10-12 15:16:16.000000000 -0600
>+++ glaxium_0.5/myship.cpp	2005-08-27 10:32:48.000000000 -0600
>@@ -20,6 +20,8 @@
> 
> 
> #include <GL/glut.h>
>+#define GL_GLEXT_PROTOTYPES
>+#include <GL/gl.h>
> #include <GL/glext.h>
> 
> #include "sprite.hpp"
>@@ -41,6 +43,9 @@
> extern PFNGLFINALCOMBINERINPUTNVPROC glFinalCombinerInputNV;
> #ifdef WIN32
> extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
>+#else
>+#define glActiveTexture(x) glActiveTextureARB(x)
>+extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
> #endif
> int MyShip::list_;
> 
>--- glaxium_0.5/scene.cpp.orig	2002-10-10 06:57:58.000000000 -0600
>+++ glaxium_0.5/scene.cpp	2005-08-27 10:34:45.000000000 -0600
>@@ -41,6 +41,8 @@
> #else
> // #define GLX_GLXEXT_LEGACY
> #define GLX_GLXEXT_PROTOTYPES 1
>+#define GL_GLXEXT_PROTOTYPES 1
>+#include <GL/gl.h>
> #include <GL/glx.h>
> // #include <GL/glxext.h>
> #endif
>@@ -66,6 +68,11 @@
> #ifdef WIN32
> PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
> PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB; 
>+#else
>+#define glActiveTexture(x) glActiveTextureARB(x)
>+#define glMultiTexCoord2f(x,y,z) glMultiTexCoord2fARB(x,y,z)
>+PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
>+PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;
 
> #endif
> 
> GLenum glError;
>@@ -1498,6 +1505,9 @@
> #ifdef WIN32
> 	glActiveTextureARB=(PFNGLACTIVETEXTUREARBPROC)wglGetProcAddress("glActiveTextureARB"); 
> 	glMultiTexCoord2fARB=(PFNGLMULTITEXCOORD2FARBPROC)wglGetProcAddress("glMultiTexCoord2fARB"); 
>+#else
>+	glActiveTextureARB=(PFNGLACTIVETEXTUREARBPROC)glXGetProcAddressARB((const GLubyte*)"glActiveTextureARB");
>+	glMultiTexCoord2fARB=(PFNGLMULTITEXCOORD2FARBPROC)glXGetProcAddressARB((const GLubyte*)"glMultiTexCoord2fARB");
> #endif
> 
> #if defined( GL_REGISTER_COMBINERS_NV) && defined(GL_VERTEX_PROGRAM_NV)
>@@ -2018,7 +2028,7 @@
> 	oldTimer = newTimer;
> 	globalList->move()	;
> #ifndef PI
>-#define PI=3.151592653589793
>+#define PI=3.141592653589793
> #endif
> 	benchFrames++;
>

Actions: View | Diff

Attachments on bug 12085: 2283 | 2339 | 2340