Attachment #46445 for bug #75066




extern PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2f;
extern PFNGLACTIVETEXTUREARBPROC glActiveTexture;
extern PFNGLACTIVETEXTUREARBPROC glClientActiveTexture;

// For VAs and VBOs
extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;

#else 
#ifndef GL_ARRAY_BUFFER_ARB 
#define GL_ARRAY_BUFFER_ARB 0x8892 
#define GL_STATIC_DRAW_ARB 0x88E4 
 
typedef void (APIENTRY * PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); 
typedef void (APIENTRY * PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); 
typedef void (APIENTRY * PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers); 
typedef void (APIENTRY * PFNGLBUFFERDATAARBPROC) (GLenum target, int size, const 
GLvoid *data, GLenum usage); 
#endif 
#endif 
// VBO Extension Function Pointers
extern PFNGLGENBUFFERSARBPROC glGenBuffers;
extern PFNGLBINDBUFFERARBPROC glBindBuffer;
extern PFNGLBUFFERDATAARBPROC glBufferData;
extern PFNGLDELETEBUFFERSARBPROC glDeleteBuffers;

#endif

void initExtensions();

bool checkExtension(const char *str);





// For VAs and VBOs
PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements = 0;
#endif
// VBO functions
PFNGLGENBUFFERSARBPROC glGenBuffers = 0;
PFNGLBINDBUFFERARBPROC glBindBuffer = 0;
PFNGLBUFFERDATAARBPROC glBufferData = 0;
PFNGLDELETEBUFFERSARBPROC glDeleteBuffers = 0;

#endif

void initExtensions() {
	
#if defined (WIN32)

  glActiveTexture = (PFNGLCLIENTACTIVETEXTUREARBPROC) SDL_GL_GetProcAddress("glActiveTextureARB");
  glClientActiveTexture = (PFNGLACTIVETEXTUREARBPROC) SDL_GL_GetProcAddress("glClientActiveTextureARB");
  glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC) SDL_GL_GetProcAddress("glDrawRangeElements");
#endif
  if (Config::configuration->checkVBO()) {
    glGenBuffers = (PFNGLGENBUFFERSARBPROC) SDL_GL_GetProcAddress("glGenBuffersARB");
    glBindBuffer = (PFNGLBINDBUFFERARBPROC) SDL_GL_GetProcAddress("glBindBufferARB");

    glDeleteBuffers = (PFNGLDELETEBUFFERSARBPROC) SDL_GL_GetProcAddress("glDeleteBuffersARB");
  }

#endif
	
}


Return to bug 75066

Lines 30-44 Link Here

(-)src/extensions.cpp.orig (-5 / +2 lines)
30		30
31	// For VAs and VBOs	31	// For VAs and VBOs
32	PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements = 0;	32	PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements = 0;
33		33	#endif
34	// VBO functions	34	// VBO functions
35	PFNGLGENBUFFERSARBPROC glGenBuffers = 0;	35	PFNGLGENBUFFERSARBPROC glGenBuffers = 0;
36	PFNGLBINDBUFFERARBPROC glBindBuffer = 0;	36	PFNGLBINDBUFFERARBPROC glBindBuffer = 0;
37	PFNGLBUFFERDATAARBPROC glBufferData = 0;	37	PFNGLBUFFERDATAARBPROC glBufferData = 0;
38	PFNGLDELETEBUFFERSARBPROC glDeleteBuffers = 0;	38	PFNGLDELETEBUFFERSARBPROC glDeleteBuffers = 0;
39		39
40	#endif
41
42	void initExtensions() {	40	void initExtensions() {
43		41
44	#if defined (WIN32)	42	#if defined (WIN32)
Lines 48-54 Link Here
48	glActiveTexture = (PFNGLCLIENTACTIVETEXTUREARBPROC) SDL_GL_GetProcAddress("glActiveTextureARB");	46	glActiveTexture = (PFNGLCLIENTACTIVETEXTUREARBPROC) SDL_GL_GetProcAddress("glActiveTextureARB");
49	glClientActiveTexture = (PFNGLACTIVETEXTUREARBPROC) SDL_GL_GetProcAddress("glClientActiveTextureARB");	47	glClientActiveTexture = (PFNGLACTIVETEXTUREARBPROC) SDL_GL_GetProcAddress("glClientActiveTextureARB");
50	glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC) SDL_GL_GetProcAddress("glDrawRangeElements");	48	glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC) SDL_GL_GetProcAddress("glDrawRangeElements");
51		49	#endif
52	if (Config::configuration->checkVBO()) {	50	if (Config::configuration->checkVBO()) {
53	glGenBuffers = (PFNGLGENBUFFERSARBPROC) SDL_GL_GetProcAddress("glGenBuffersARB");	51	glGenBuffers = (PFNGLGENBUFFERSARBPROC) SDL_GL_GetProcAddress("glGenBuffersARB");
54	glBindBuffer = (PFNGLBINDBUFFERARBPROC) SDL_GL_GetProcAddress("glBindBufferARB");	52	glBindBuffer = (PFNGLBINDBUFFERARBPROC) SDL_GL_GetProcAddress("glBindBufferARB");
Lines 56-62 Link Here
56	glDeleteBuffers = (PFNGLDELETEBUFFERSARBPROC) SDL_GL_GetProcAddress("glDeleteBuffersARB");	54	glDeleteBuffers = (PFNGLDELETEBUFFERSARBPROC) SDL_GL_GetProcAddress("glDeleteBuffersARB");
57	}	55	}
58		56
59	#endif
60		57
61	}	58	}
62		59

Lines 25-42 Link Here

(-)src/extensions.h.orig (-3 / +12 lines)
25	extern PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2f;	25	extern PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2f;
26	extern PFNGLACTIVETEXTUREARBPROC glActiveTexture;	26	extern PFNGLACTIVETEXTUREARBPROC glActiveTexture;
27	extern PFNGLACTIVETEXTUREARBPROC glClientActiveTexture;	27	extern PFNGLACTIVETEXTUREARBPROC glClientActiveTexture;
28
29	// For VAs and VBOs	28	// For VAs and VBOs
30	extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;	29	extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
31		30
		31	#else
		32	#ifndef GL_ARRAY_BUFFER_ARB
		33	#define GL_ARRAY_BUFFER_ARB 0x8892
		34	#define GL_STATIC_DRAW_ARB 0x88E4
		35
		36	typedef void (APIENTRY * PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
		37	typedef void (APIENTRY * PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
		38	typedef void (APIENTRY * PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
		39	typedef void (APIENTRY * PFNGLBUFFERDATAARBPROC) (GLenum target, int size, const
		40	GLvoid *data, GLenum usage);
		41	#endif
		42	#endif
32	// VBO Extension Function Pointers	43	// VBO Extension Function Pointers
33	extern PFNGLGENBUFFERSARBPROC glGenBuffers;	44	extern PFNGLGENBUFFERSARBPROC glGenBuffers;
34	extern PFNGLBINDBUFFERARBPROC glBindBuffer;	45	extern PFNGLBINDBUFFERARBPROC glBindBuffer;
35	extern PFNGLBUFFERDATAARBPROC glBufferData;	46	extern PFNGLBUFFERDATAARBPROC glBufferData;
36	extern PFNGLDELETEBUFFERSARBPROC glDeleteBuffers;	47	extern PFNGLDELETEBUFFERSARBPROC glDeleteBuffers;
37		48
38	#endif
39
40	void initExtensions();	49	void initExtensions();
41		50
42	bool checkExtension(const char *str);	51	bool checkExtension(const char *str);