diff --git a/ChangeLog b/ChangeLog index e4d1b0bc7..e83622cc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-05-22 Matthew Mueller + * arch/ogl/gr.c, include/loadgl.h: fix win32 + GL_NV_register_combiners build stuff (d1x r1.39, r1.7) + * arch/ogl/gr.c, arch/ogl/ogl.c, include/loadgl.h, include/ogl_init.h, main/render.c: opengl hardware super-transparency support using GL_NV_register_combiners (d1x diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index 57f9db594..bce90d194 100644 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -1,4 +1,4 @@ -/* $Id: gr.c,v 1.29 2004-05-22 21:48:33 btb Exp $ */ +/* $Id: gr.c,v 1.30 2004-05-22 21:55:29 btb Exp $ */ /* * * OGL video functions. - Added 9/15/99 Matthew Mueller @@ -187,6 +187,7 @@ void ogl_get_verinfo(void) dglCombinerParameteriNV = (glCombinerParameteriNV_fp)wglGetProcAddress("glCombinerParameteriNV"); dglCombinerInputNV = (glCombinerInputNV_fp)wglGetProcAddress("glCombinerInputNV"); dglCombinerOutputNV = (glCombinerOutputNV_fp)wglGetProcAddress("glCombinerOutputNV"); + dglFinalCombinerInputNV = (glFinalCombinerInputNV_fp)wglGetProcAddress("glFinalCombinerInputNV"); #endif #ifdef GL_ARB_multitexture diff --git a/include/loadgl.h b/include/loadgl.h index 7d4e3369b..100af66aa 100644 --- a/include/loadgl.h +++ b/include/loadgl.h @@ -1,4 +1,4 @@ -/* $Id: loadgl.h,v 1.9 2004-05-22 21:48:41 btb Exp $ */ +/* $Id: loadgl.h,v 1.10 2004-05-22 21:55:33 btb Exp $ */ /* * * dynamic opengl loading - courtesy of Jeff Slutter @@ -456,6 +456,7 @@ #define glCombinerParameteriNV dglCombinerParameteriNV #define glCombinerInputNV dglCombinerInputNV #define glCombinerOutputNV dglCombinerOutputNV +#define glFinalCombinerInputNV dglFinalCombinerInputNV #ifdef _WIN32 #define wglCopyContext dwglCopyContext @@ -826,6 +827,7 @@ typedef void (OGLFUNCCALL *glColorTableEXT_fp)(GLenum target, GLenum internalfor typedef void (OGLFUNCCALL *glCombinerParameteriNV_fp)(GLenum, GLint); typedef void (OGLFUNCCALL *glCombinerInputNV_fp)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum); typedef void (OGLFUNCCALL *glCombinerOutputNV_fp)(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean); +typedef void (OGLFUNCCALL *glFinalCombinerInputNV_fp)(GLenum, GLenum, GLenum, GLenum); #ifdef _WIN32 typedef BOOL (OGLFUNCCALL *wglCopyContext_fp)(HGLRC, HGLRC, UINT); @@ -1193,6 +1195,10 @@ DEFVAR glActiveTextureARB_fp dglActiveTextureARB; DEFVAR glMultiTexCoord2fSGIS_fp dglMultiTexCoord2fSGIS; DEFVAR glSelectTextureSGIS_fp dglSelectTextureSGIS; DEFVAR glColorTableEXT_fp dglColorTableEXT; +DEFVAR glCombinerParameteriNV_fp dglCombinerParameteriNV; +DEFVAR glCombinerInputNV_fp dglCombinerInputNV; +DEFVAR glCombinerOutputNV_fp dglCombinerOutputNV; +DEFVAR glFinalCombinerInputNV_fp dglFinalCombinerInputNV; #ifdef _WIN32 DEFVAR wglCopyContext_fp dwglCopyContext; @@ -2014,6 +2020,7 @@ void OpenGL_SetFuncsToNull(void) dglCombinerParameteriNV = NULL; dglCombinerInputNV = NULL; dglCombinerOutputNV = NULL; + dglFinalCombinerInputNV = NULL; #ifdef _WIN32 dwglCopyContext = NULL;