updates from mesa3d@billbaxter.com

diff --git a/src/mesa/drivers/windows/wgl.c b/src/mesa/drivers/windows/wgl.c
index 5954833df6e9136d70887fc30b4c54346e786ffd..93a64983abee3d6ef6ca6d9a31e3aff73ef3f044 100644 (file)
--- a/src/mesa/drivers/windows/wgl.c
+++ b/src/mesa/drivers/windows/wgl.c
@@ -1,4 +1,4 @@
-/* $Id: wgl.c,v 1.2 1999/09/19 09:59:20 tjump Exp $ */
+/* $Id: wgl.c,v 1.3 2000/08/02 20:29:03 brianp Exp $ */
 
 /*
 * This library is free software; you can redistribute it and/or
@@ -30,8 +30,9 @@ extern "C" {
 #endif
 
 #include <windows.h>
-
+#define GL_GLEXT_PROTOTYPES
 #include <GL/gl.h>
+#include <GL/glext.h>
 //#include <GL/glu.h>
 
 #ifdef __cplusplus
@@ -90,7 +91,7 @@ struct __extensions__ ext[] = {
    { (PROC)glGetColorTableParameterivEXT,      "glGetColorTableParameterivEXT" },
    { (PROC)glPointParameterfEXT,               "glPointParameterfEXT"          },
    { (PROC)glPointParameterfvEXT,              "glPointParameterfvEXT"         },
-   { (PROC)glBlendFuncSeparateINGR,            "glBlendFuncSeparateINGR"       },
+   { (PROC)glBlendFuncSeparateEXT,             "glBlendFuncSeparateEXT"        },
    { (PROC)glLockArraysEXT,                    "glLockArraysEXT"               },
    { (PROC)glUnlockArraysEXT,                  "glUnlockArraysEXT"             }
 };

diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index a08873ddeda8a7e2f5e5a6b2ef56ba14562886e7..00f156a1026036ff01d187f02f2102c70e77bd63 100644 (file)
--- a/src/mesa/drivers/windows/wmesa.c
+++ b/src/mesa/drivers/windows/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.3 2000/03/03 23:21:57 brianp Exp $ */
+/* $Id: wmesa.c,v 1.4 2000/08/02 20:29:03 brianp Exp $ */
 
 /*
 *   File name   :   wmesa.c
@@ -22,6 +22,12 @@
 
 /*
  * $Log: wmesa.c,v $
+ * Revision 1.4  2000/08/02 20:29:03  brianp
+ * updates from mesa3d@billbaxter.com
+ *
+ * Revision 1.3.4.1  2000/08/02 20:28:19  brianp
+ * updates from mesa3d@billbaxter.com
+ *
  * Revision 1.3  2000/03/03 23:21:57  brianp
  * removed obsolete logicop function
  *
@@ -84,7 +90,7 @@
 #include "depth.h"
 #include "wmesadef.h"
 
-#pragma warning ( disable : 4133 4761 )
+#pragma warning ( disable : 4100 4133 4761 )
 
 #ifdef PROFILE
 //  #include "profile.h"
@@ -430,9 +436,9 @@ static void clear_color( GLcontext* ctx, GLubyte r, GLubyte g, GLubyte b, GLubyt
 */
 //static void clear(GLcontext* ctx,
 //                  GLboolean all,GLint x, GLint y, GLint width, GLint height )
-// TODO: I modified this function to match the prototype in dd.h. (swansma@geocities.com)
-//       dd.h does not explain what the return type is so I could not set this to the proper
-//       value.
+// TODO: I modified this function to match the prototype in
+//       dd.h. (swansma@geocities.com)
+
 static GLbitfield clear(GLcontext* ctx, GLbitfield mask,
                   GLboolean all, GLint x, GLint y, GLint width, GLint height)
 {