summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Fuller <relnev@icculus.org>2002-01-10 02:53:02 +0000
committerPatryk Obara <dreamer.tan@gmail.com>2019-08-20 02:22:37 +0200
commit8e87ff0f3e5787ba93d615b1c27749b5f7d65abc (patch)
treeb6df25ca297a16e7d077075bdb27cd63231566af
parent08545b98c621ca2303108db79154046f360451eb (diff)
Commented out secondary color stuff due to nvidia header lameness
-rw-r--r--src/main.c4
-rw-r--r--src/opengl.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/main.c b/src/main.c
index 82a35d9..e706169 100644
--- a/src/main.c
+++ b/src/main.c
@@ -68,9 +68,11 @@ static int WantCDRom = 1;
static int WantJoystick = 1;
#endif
+#if 0 /* NVIDIA gl.h breaks this */
#if GL_EXT_secondary_color
PFNGLSECONDARYCOLORPOINTEREXTPROC pglSecondaryColorPointerEXT;
#endif
+#endif
/* ** */
@@ -509,6 +511,7 @@ int SetOGLVideoMode(int Width, int Height)
/*
printf("OpenGL Extensions: %s\n", ext);
*/
+#if 0 /* NVIDIA header problem */
#if GL_EXT_secondary_color
pglSecondaryColorPointerEXT = NULL;
@@ -525,6 +528,7 @@ int SetOGLVideoMode(int Width, int Height)
printf("GL_EXT_secondary_color not found...\n");
}
#endif
+#endif
InitOpenGL();
diff --git a/src/opengl.c b/src/opengl.c
index d799d18..8eea18c 100644
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -55,9 +55,11 @@ static D3DTexture *CurrentlyBoundTexture = NULL;
#define TA_MAXVERTICES 2048
#define TA_MAXTRIANGLES 2048
+#if 0 /* NVIDIA header problem */
#if GL_EXT_secondary_color
extern PFNGLSECONDARYCOLORPOINTEREXTPROC pglSecondaryColorPointerEXT;
#endif
+#endif
typedef struct VertexArray
{