[xine-cvs] CVS: xine-lib/src/video_out glext.h,NONE,1.1 video_out_opengl.c,1.46,1.47

[Matthias H. <ms...@us...>]

Update of /cvsroot/xine/xine-lib/src/video_out
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20973

Modified Files:
	video_out_opengl.c 
Added Files:
	glext.h 
Log Message:
Using self-supplied glext.h now in order to reduce compile requirements.


--- NEW FILE: glext.h ---
#ifndef __glext_h_
#define __glext_h_

#ifdef __cplusplus
extern "C" {
#endif

/*
** License Applicability. Except to the extent portions of this file are
** made subject to an alternative license as permitted in the SGI Free
** Software License B, Version 1.1 (the "License"), the contents of this
** file are subject only to the provisions of the License. You may not use
** this file except in compliance with the License. You may obtain a copy
** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
** 
** http://oss.sgi.com/projects/FreeB
** 
** Note that, as provided in the License, the Software is distributed on an
[...6452 lines suppressed...]
typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
#endif

#ifndef GL_GREMEDY_string_marker
#define GL_GREMEDY_string_marker 1
#ifdef GL_GLEXT_PROTOTYPES
GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *);
#endif /* GL_GLEXT_PROTOTYPES */
typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string);
#endif


#ifdef __cplusplus
}
#endif

#endif

Index: video_out_opengl.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_opengl.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- video_out_opengl.c	5 Apr 2005 13:27:35 -0000	1.46
+++ video_out_opengl.c	6 Apr 2005 16:12:02 -0000	1.47
@@ -50,9 +50,12 @@
 #include <ctype.h>
 #include <pthread.h>
 
+/* We are not legacy, but we provide our own glext.h */
+#define GL_GLEXT_LEGACY 1
 #include <GL/gl.h>
 #include <GL/glx.h>
 #include <GL/glu.h>
+#include "glext.h"
 
 #include "xine.h"
 #include "video_out.h"
@@ -75,6 +78,7 @@
 #if     defined (_WIN32)
 #define getaddr(x) wglGetProcAddress(x)
 #else
+/* !@#$% ARB. What on earth drove them to nuke that definition in 1.4?!? */
 extern void *glXGetProcAddressARB(const GLubyte *procName);
 #define getaddr(x) glXGetProcAddressARB(x)
 #endif