Attachment #2340 for bug #12085

View | Details | Raw Unified | Return to bug 12085
Collapse All | Expand All

Lines 20-25 Link Here

(-)glaxium_0.5/myship.cpp.orig (+5 lines)
20		20
21		21
22	#include <GL/glut.h>	22	#include <GL/glut.h>
		23	#define GL_GLEXT_PROTOTYPES
		24	#include <GL/gl.h>
23	#include <GL/glext.h>	25	#include <GL/glext.h>
24		26
25	#include "sprite.hpp"	27	#include "sprite.hpp"
Lines 41-46 Link Here
41	extern PFNGLFINALCOMBINERINPUTNVPROC glFinalCombinerInputNV;	43	extern PFNGLFINALCOMBINERINPUTNVPROC glFinalCombinerInputNV;
42	#ifdef WIN32	44	#ifdef WIN32
43	extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;	45	extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
		46	#else
		47	#define glActiveTexture(x) glActiveTextureARB(x)
		48	extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
44	#endif	49	#endif
45	int MyShip::list_;	50	int MyShip::list_;
46		51

Lines 41-46 Link Here

(-)glaxium_0.5/scene.cpp.orig (-1 / +11 lines)
41	#else	41	#else
42	// #define GLX_GLXEXT_LEGACY	42	// #define GLX_GLXEXT_LEGACY
43	#define GLX_GLXEXT_PROTOTYPES 1	43	#define GLX_GLXEXT_PROTOTYPES 1
		44	#define GL_GLXEXT_PROTOTYPES 1
		45	#include <GL/gl.h>
44	#include <GL/glx.h>	46	#include <GL/glx.h>
45	// #include <GL/glxext.h>	47	// #include <GL/glxext.h>
46	#endif	48	#endif
Lines 66-71 Link Here
66	#ifdef WIN32	68	#ifdef WIN32
67	PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;	69	PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
68	PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;	70	PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;
		71	#else
		72	#define glActiveTexture(x) glActiveTextureARB(x)
		73	#define glMultiTexCoord2f(x,y,z) glMultiTexCoord2fARB(x,y,z)
		74	PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
		75	PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;
69	#endif	76	#endif
70		77
71	GLenum glError;	78	GLenum glError;
Lines 1498-1503 Link Here
1498	#ifdef WIN32	1505	#ifdef WIN32
1499	glActiveTextureARB=(PFNGLACTIVETEXTUREARBPROC)wglGetProcAddress("glActiveTextureARB");	1506	glActiveTextureARB=(PFNGLACTIVETEXTUREARBPROC)wglGetProcAddress("glActiveTextureARB");
1500	glMultiTexCoord2fARB=(PFNGLMULTITEXCOORD2FARBPROC)wglGetProcAddress("glMultiTexCoord2fARB");	1507	glMultiTexCoord2fARB=(PFNGLMULTITEXCOORD2FARBPROC)wglGetProcAddress("glMultiTexCoord2fARB");
		1508	#else
		1509	glActiveTextureARB=(PFNGLACTIVETEXTUREARBPROC)glXGetProcAddressARB((const GLubyte*)"glActiveTextureARB");
		1510	glMultiTexCoord2fARB=(PFNGLMULTITEXCOORD2FARBPROC)glXGetProcAddressARB((const GLubyte*)"glMultiTexCoord2fARB");
1501	#endif	1511	#endif
1502		1512
1503	#if defined( GL_REGISTER_COMBINERS_NV) && defined(GL_VERTEX_PROGRAM_NV)	1513	#if defined( GL_REGISTER_COMBINERS_NV) && defined(GL_VERTEX_PROGRAM_NV)
Lines 2018-2024 Link Here
2018	oldTimer = newTimer;	2028	oldTimer = newTimer;
2019	globalList->move() ;	2029	globalList->move() ;
2020	#ifndef PI	2030	#ifndef PI
2021	#define PI=3.151592653589793	2031	#define PI=3.141592653589793
2022	#endif	2032	#endif
2023	benchFrames++;	2033	benchFrames++;
2024		2034

Return to bug 12085