fix patches, CVS choked on the previous ones

This commit is contained in:
brad 1999-03-09 03:52:40 +00:00
parent f4d2216f66
commit 6ec387241b
5 changed files with 2 additions and 96 deletions

View File

@ -1,24 +1,5 @@
--- src/copypix.c.orig Sun Mar 7 19:12:34 1999
+++ src/copypix.c Sun Mar 7 19:13:11 1999
@@ -1,4 +1,4 @@
-/* $Id: patch-ad,v 1.1 1999/03/09 02:09:09 brad Exp $ */
+/* $Id: patch-ad,v 1.1 1999/03/09 02:09:09 brad Exp $ */
/*
* Mesa 3-D graphics library
@@ -23,6 +23,9 @@
/*
* $Log: patch-ad,v $
* Revision 1.1 1999/03/09 02:09:09 brad
* fixups and add currently available patches from Mesa web page
*
+ * Revision 3.9 1998/09/25 03:03:01 brianp
+ * fixed front/back alpha copy bug per Sam Jordan
+ *
* Revision 3.8 1998/07/17 03:24:16 brianp
* added Pixel.ScaleOrBiasRGBA field
*
--- src/copypix.c.orig Mon Mar 8 22:33:30 1999
+++ src/copypix.c Mon Mar 8 22:35:18 1999
@@ -71,9 +74,10 @@

View File

@ -1,29 +1,5 @@
--- src/get.c.orig Sun Mar 7 19:14:22 1999
+++ src/get.c Sun Mar 7 19:14:27 1999
@@ -1,8 +1,8 @@
-/* $Id: patch-ae,v 1.1 1999/03/09 02:09:09 brad Exp $ */
+/* $Id: patch-ae,v 1.1 1999/03/09 02:09:09 brad Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.0
+ * Version: 3.1
* Copyright (C) 1995-1998 Brian Paul
*
* This library is free software; you can redistribute it and/or
@@ -23,6 +23,9 @@
/*
* $Log: patch-ae,v $
* Revision 1.1 1999/03/09 02:09:09 brad
* fixups and add currently available patches from Mesa web page
*
+ * Revision 3.16 1998/10/01 02:51:39 brianp
+ * added GL_MAX_3D_TEXTURE_SIZE support to glGet*()
+ *
* Revision 3.15 1998/07/29 04:09:33 brianp
* getting polygon stipple on/off state was broken
*
@@ -588,6 +591,7 @@
*params = INT_TO_BOOL(MAX_PROJECTION_STACK_DEPTH);
break;

View File

@ -1,18 +1,5 @@
--- src/misc.c.orig Sun Mar 7 19:14:46 1999
+++ src/misc.c Sun Mar 7 19:14:51 1999
@@ -23,6 +23,9 @@
/*
* $Log: patch-af,v $
* Revision 1.1 1999/03/09 02:09:09 brad
* fixups and add currently available patches from Mesa web page
*
+ * Revision 3.14.1 1999/02/17 22:00:00 brianp
+ * fixed bug when clearing color buffer with RGBA or index masking
+ *
* Revision 3.14 1998/09/18 02:32:02 brianp
* fixed alpha clear problem reported by Sam Jordan
*
@@ -260,8 +263,17 @@
width = ctx->Buffer->Xmax - ctx->Buffer->Xmin + 1;

View File

@ -1,24 +1,5 @@
--- src/pixel.c.orig Sun Mar 7 19:15:18 1999
+++ src/pixel.c Sun Mar 7 19:15:22 1999
@@ -1,4 +1,4 @@
-/* $Id: patch-ag,v 1.1 1999/03/09 02:09:09 brad Exp $ */
+/* $Id: patch-ag,v 1.1 1999/03/09 02:09:09 brad Exp $ */
/*
* Mesa 3-D graphics library
@@ -23,6 +23,9 @@
/*
* $Log: patch-ag,v $
* Revision 1.1 1999/03/09 02:09:09 brad
* fixups and add currently available patches from Mesa web page
*
+ * Revision 3.7 1998/09/29 01:35:41 brianp
+ * glPixelStore() now handles GL_PACK/UNPACK_IMAGE_HEIGHT
+ *
* Revision 3.6 1998/07/17 03:23:47 brianp
* added a bunch of const's
*
@@ -113,6 +116,12 @@
ctx->Pack.RowLength = param;
}

View File

@ -1,24 +1,5 @@
--- src/teximage.c.orig Sun Mar 7 19:15:47 1999
+++ src/teximage.c Sun Mar 7 19:15:52 1999
@@ -1,4 +1,4 @@
-/* $Id: patch-ah,v 1.1 1999/03/09 02:09:10 brad Exp $ */
+/* $Id: patch-ah,v 1.1 1999/03/09 02:09:10 brad Exp $ */
/*
* Mesa 3-D graphics library
@@ -23,6 +23,9 @@
/*
* $Log: patch-ah,v $
* Revision 1.1 1999/03/09 02:09:10 brad
* fixups and add currently available patches from Mesa web page
*
+ * Revision 3.13 1998/09/25 03:07:34 brianp
+ * fixed out-of-bounds memory access on X86 (Sven Panne)
+ *
* Revision 3.12 1998/09/18 02:32:40 brianp
* fixed proxy texture internal format bug reported by Sam Jordon
*
@@ -279,6 +282,16 @@