[Xorg-commit] xc/lib/GL/apple Imakefile,1.1,1.1.4.1 dri_dispatch.defs,1.1.4.1,1.1.4.2 dri_dispatch.h,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
Committed by: kaleb
Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/apple/Imakefile,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/Imakefile 25 Nov 2003 19:28:02 -0000 1.1
+++ b/Imakefile 23 Feb 2004 21:33:55 -0000 1.1.4.1
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/GL/apple/Imakefile,v 1.2 2003/10/09 23:42:32 torrey Exp $
+XCOMM $XFree86: xc/lib/GL/apple/Imakefile,v 1.3 2004/01/17 00:38:12 torrey Exp $
#include <Threads.tmpl>
@@ -28,14 +28,9 @@
-I$(GLXLIBSRC)/include
#endif
-#if GlxBuiltInTdfx
- TDFX_DEFS = -DUSE_TDFX
-#endif
-
AS = /System/Library/Frameworks/ApplicationServices.framework
- DEFINES = $(ALLOC_DEFINES) GlxDefines $(TDFX_DEFS) $(GLX_DEFS) \
- -DXP_NO_X_HEADERS=1
+ DEFINES = $(ALLOC_DEFINES) GlxDefines $(GLX_DEFS) -DXP_NO_X_HEADERS=1
INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) $(DRI_INCS) \
-F$(AS)/Frameworks
SRCS = appledri.c $(DRI_SRCS)
Index: dri_dispatch.defs
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/apple/dri_dispatch.defs,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/dri_dispatch.defs 6 Dec 2003 13:22:43 -0000 1.1.4.1
+++ b/dri_dispatch.defs 23 Feb 2004 21:33:55 -0000 1.1.4.2
@@ -3,8 +3,7 @@
;; dri_dispatch.defs
;; $Id: dri_dispatch.defs,v 1.9 2003/02/17 20:05:41 jharper Exp $
-;; $XFree86: xc/lib/GL/apple/dri_dispatch.defs,v 1.4 2003/11/25 00:23:03 torrey Exp $
-;; $XdotOrg$
+;; $XFree86: xc/lib/GL/apple/dri_dispatch.defs,v 1.5 2004/01/16 22:39:56 torrey Exp $
;; Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
;; Copyright (c) 2003 Torrey T. Lyons. All rights reserved.
@@ -621,6 +620,23 @@
(void CompressedTexSubImage2DARB 383 "GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data")
(void CompressedTexSubImage1DARB 384 "GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data")
(void GetCompressedTexImageARB 385 "GLenum target, GLint level, void * img")
+(void SecondaryColor3bEXT 386 "GLbyte red, GLbyte green, GLbyte blue")
+(void SecondaryColor3bvEXT 387 "const GLbyte * v")
+(void SecondaryColor3dEXT 388 "GLdouble red, GLdouble green, GLdouble blue")
+(void SecondaryColor3dvEXT 389 "const GLdouble * v")
+(void SecondaryColor3fEXT 390 "GLfloat red, GLfloat green, GLfloat blue")
+(void SecondaryColor3fvEXT 391 "const GLfloat * v")
+(void SecondaryColor3iEXT 392 "GLint red, GLint green, GLint blue")
+(void SecondaryColor3ivEXT 393 "const GLint * v")
+(void SecondaryColor3sEXT 394 "GLshort red, GLshort green, GLshort blue")
+(void SecondaryColor3svEXT 395 "const GLshort * v")
+(void SecondaryColor3ubEXT 396 "GLubyte red, GLubyte green, GLubyte blue")
+(void SecondaryColor3ubvEXT 397 "const GLubyte * v")
+(void SecondaryColor3uiEXT 398 "GLuint red, GLuint green, GLuint blue")
+(void SecondaryColor3uivEXT 399 "const GLuint * v")
+(void SecondaryColor3usEXT 400 "GLushort red, GLushort green, GLushort blue")
+(void SecondaryColor3usvEXT 401 "const GLushort * v")
+(void SecondaryColorPointerEXT 402 "GLint size, GLenum type, GLsizei stride, const GLvoid * pointer")
(GLboolean AreProgramsResidentNV -1 "GLsizei n, const GLuint * ids, GLboolean * residences")
(void BindProgramNV -1 "GLenum target, GLuint id")
(void DeleteProgramsNV -1 "GLsizei n, const GLuint * ids")
Index: dri_dispatch.h
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/apple/dri_dispatch.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/dri_dispatch.h 6 Dec 2003 13:22:43 -0000 1.1.4.1
+++ b/dri_dispatch.h 23 Feb 2004 21:33:55 -0000 1.1.4.2
@@ -1,8 +1,6 @@
/* dri_dispatch.h -- built automatically, DO NOT EDIT
$Id$
- $XFree86: xc/lib/GL/apple/dri_dispatch.h,v 1.4 2003/11/25 00:23:03 torrey Exp $
- $XdotOrg$
-*/
+ $XFree86: xc/lib/GL/apple/dri_dispatch.h,v 1.5 2004/01/17 00:38:12 torrey Exp $ */
DEFUN_LOCAL_VOID (NewList,
(void *rend, GLuint list, GLenum mode),
@@ -2244,6 +2242,74 @@
(void *rend, GLenum target, GLint level, void * img),
(target, level, img))
+DEFUN_LOCAL_VOID (SecondaryColor3bEXT,
+ (void *rend, GLbyte red, GLbyte green, GLbyte blue),
+ (red, green, blue))
+
+DEFUN_LOCAL_VOID (SecondaryColor3bvEXT,
+ (void *rend, const GLbyte * v),
+ (v))
+
+DEFUN_LOCAL_VOID (SecondaryColor3dEXT,
+ (void *rend, GLdouble red, GLdouble green, GLdouble blue),
+ (red, green, blue))
+
+DEFUN_LOCAL_VOID (SecondaryColor3dvEXT,
+ (void *rend, const GLdouble * v),
+ (v))
+
+DEFUN_LOCAL_VOID (SecondaryColor3fEXT,
+ (void *rend, GLfloat red, GLfloat green, GLfloat blue),
+ (red, green, blue))
+
+DEFUN_LOCAL_VOID (SecondaryColor3fvEXT,
+ (void *rend, const GLfloat * v),
+ (v))
+
+DEFUN_LOCAL_VOID (SecondaryColor3iEXT,
+ (void *rend, GLint red, GLint green, GLint blue),
+ (red, green, blue))
+
+DEFUN_LOCAL_VOID (SecondaryColor3ivEXT,
+ (void *rend, const GLint * v),
+ (v))
+
+DEFUN_LOCAL_VOID (SecondaryColor3sEXT,
+ (void *rend, GLshort red, GLshort green, GLshort blue),
+ (red, green, blue))
+
+DEFUN_LOCAL_VOID (SecondaryColor3svEXT,
+ (void *rend, const GLshort * v),
+ (v))
+
+DEFUN_LOCAL_VOID (SecondaryColor3ubEXT,
+ (void *rend, GLubyte red, GLubyte green, GLubyte blue),
+ (red, green, blue))
+
+DEFUN_LOCAL_VOID (SecondaryColor3ubvEXT,
+ (void *rend, const GLubyte * v),
+ (v))
+
+DEFUN_LOCAL_VOID (SecondaryColor3uiEXT,
+ (void *rend, GLuint red, GLuint green, GLuint blue),
+ (red, green, blue))
+
+DEFUN_LOCAL_VOID (SecondaryColor3uivEXT,
+ (void *rend, const GLuint * v),
+ (v))
+
+DEFUN_LOCAL_VOID (SecondaryColor3usEXT,
+ (void *rend, GLushort red, GLushort green, GLushort blue),
+ (red, green, blue))
+
+DEFUN_LOCAL_VOID (SecondaryColor3usvEXT,
+ (void *rend, const GLushort * v),
+ (v))
+
+DEFUN_LOCAL_VOID (SecondaryColorPointerEXT,
+ (void *rend, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer),
+ (size, type, stride, pointer))
+
DEFUN_EXTERN (GLboolean, AreProgramsResidentNV,
(GLsizei n, const GLuint * ids, GLboolean * residences),
(n, ids, residences))
@@ -3096,6 +3162,23 @@
(d)[383] = (void *) &p ## CompressedTexSubImage2DARB; \
(d)[384] = (void *) &p ## CompressedTexSubImage1DARB; \
(d)[385] = (void *) &p ## GetCompressedTexImageARB; \
+ (d)[386] = (void *) &p ## SecondaryColor3bEXT; \
+ (d)[387] = (void *) &p ## SecondaryColor3bvEXT; \
+ (d)[388] = (void *) &p ## SecondaryColor3dEXT; \
+ (d)[389] = (void *) &p ## SecondaryColor3dvEXT; \
+ (d)[390] = (void *) &p ## SecondaryColor3fEXT; \
+ (d)[391] = (void *) &p ## SecondaryColor3fvEXT; \
+ (d)[392] = (void *) &p ## SecondaryColor3iEXT; \
+ (d)[393] = (void *) &p ## SecondaryColor3ivEXT; \
+ (d)[394] = (void *) &p ## SecondaryColor3sEXT; \
+ (d)[395] = (void *) &p ## SecondaryColor3svEXT; \
+ (d)[396] = (void *) &p ## SecondaryColor3ubEXT; \
+ (d)[397] = (void *) &p ## SecondaryColor3ubvEXT; \
+ (d)[398] = (void *) &p ## SecondaryColor3uiEXT; \
+ (d)[399] = (void *) &p ## SecondaryColor3uivEXT; \
+ (d)[400] = (void *) &p ## SecondaryColor3usEXT; \
+ (d)[401] = (void *) &p ## SecondaryColor3usvEXT; \
+ (d)[402] = (void *) &p ## SecondaryColorPointerEXT; \
(d)[403] = (void *) &p ## VertexArrayRangeNV; \
(d)[405] = (void *) &p ## DrawRangeElements; \
(d)[406] = (void *) &p ## ColorTable; \
More information about the xorg-commit
mailing list