diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-08-02 20:28:19 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-08-02 20:28:19 +0000 |
| commit | e0fd3762ce5e0fb2e1479c72664abc35a23c4ec0 (patch) | |
| tree | 8a7b05e6d5008e023b7e8c041c22db830c79804d | |
| parent | 1274afbe0b48c6d79ba1168d4c27bad99830860c (diff) | |
updates from mesa3d@billbaxter.com
| -rw-r--r-- | src/mesa/drivers/windows/wgl.c | 7 | ||||
| -rw-r--r-- | src/mesa/drivers/windows/wmesa.c | 13 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/mesa/drivers/windows/wgl.c b/src/mesa/drivers/windows/wgl.c index 5954833df6e..40d4e297dd4 100644 --- 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.2.6.1 2000/08/02 20:28:19 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 a08873ddeda..ae65b35b2fd 100644 --- 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.3.4.1 2000/08/02 20:28:19 brianp Exp $ */ /* * File name : wmesa.c @@ -22,6 +22,9 @@ /* * $Log: wmesa.c,v $ + * 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 +87,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 +433,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) { |