added 1f and 4f glTexCoord/glMultiTexCoord function declarations

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5100 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/glquake.h b/glquake.h
index d2646e38400681c8de483e63a872307ca1db4230..e1b3372d934e75e4c849132d2996bf7ba6f05b28 100644 (file)
--- a/glquake.h
+++ b/glquake.h
@@ -222,8 +222,10 @@ extern int gl_max_anisotropy;
 
 // GL_ARB_multitexture
 extern int gl_textureunits;
 
 // GL_ARB_multitexture
 extern int gl_textureunits;

+extern void (GLAPIENTRY *qglMultiTexCoord1f) (GLenum, GLfloat);

 extern void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat);
 extern void (GLAPIENTRY *qglMultiTexCoord3f) (GLenum, GLfloat, GLfloat, GLfloat);
 extern void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat);
 extern void (GLAPIENTRY *qglMultiTexCoord3f) (GLenum, GLfloat, GLfloat, GLfloat);

+extern void (GLAPIENTRY *qglMultiTexCoord4f) (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);

 extern void (GLAPIENTRY *qglActiveTexture) (GLenum);
 extern void (GLAPIENTRY *qglClientActiveTexture) (GLenum);
 #ifndef GL_ACTIVE_TEXTURE_ARB
 extern void (GLAPIENTRY *qglActiveTexture) (GLenum);
 extern void (GLAPIENTRY *qglClientActiveTexture) (GLenum);
 #ifndef GL_ACTIVE_TEXTURE_ARB


@@ -424,8 +426,10 @@ extern void (GLAPIENTRY *qglTexCoordPointer)(GLint size, GLenum type, GLsizei st
 extern void (GLAPIENTRY *qglArrayElement)(GLint i);
 
 extern void (GLAPIENTRY *qglColor4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
 extern void (GLAPIENTRY *qglArrayElement)(GLint i);
 
 extern void (GLAPIENTRY *qglColor4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);

+extern void (GLAPIENTRY *qglTexCoord1f)(GLfloat s);

 extern void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t);
 extern void (GLAPIENTRY *qglTexCoord3f)(GLfloat s, GLfloat t, GLfloat r);
 extern void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t);
 extern void (GLAPIENTRY *qglTexCoord3f)(GLfloat s, GLfloat t, GLfloat r);

+extern void (GLAPIENTRY *qglTexCoord4f)(GLfloat s, GLfloat t, GLfloat r, GLfloat q);

 extern void (GLAPIENTRY *qglVertex2f)(GLfloat x, GLfloat y);
 extern void (GLAPIENTRY *qglVertex3f)(GLfloat x, GLfloat y, GLfloat z);
 extern void (GLAPIENTRY *qglBegin)(GLenum mode);
 extern void (GLAPIENTRY *qglVertex2f)(GLfloat x, GLfloat y);
 extern void (GLAPIENTRY *qglVertex3f)(GLfloat x, GLfloat y, GLfloat z);
 extern void (GLAPIENTRY *qglBegin)(GLenum mode);

diff --git a/vid_shared.c b/vid_shared.c
index 2d9a81d9888252daa2eabff09ef055a000b2a8f7..2eb39f3a770b64a6d16eef3ef97819489fc8b515 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -111,8 +111,10 @@ const char *gl_platformextensions;
 char gl_driver[256];
 
 // GL_ARB_multitexture
 char gl_driver[256];
 
 // GL_ARB_multitexture

+void (GLAPIENTRY *qglMultiTexCoord1f) (GLenum, GLfloat);

 void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat);
 void (GLAPIENTRY *qglMultiTexCoord3f) (GLenum, GLfloat, GLfloat, GLfloat);
 void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat);
 void (GLAPIENTRY *qglMultiTexCoord3f) (GLenum, GLfloat, GLfloat, GLfloat);

+void (GLAPIENTRY *qglMultiTexCoord4f) (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);

 void (GLAPIENTRY *qglActiveTexture) (GLenum);
 void (GLAPIENTRY *qglClientActiveTexture) (GLenum);
 
 void (GLAPIENTRY *qglActiveTexture) (GLenum);
 void (GLAPIENTRY *qglClientActiveTexture) (GLenum);
 


@@ -170,9 +172,10 @@ void (GLAPIENTRY *qglTexCoordPointer)(GLint size, GLenum type, GLsizei stride, c
 void (GLAPIENTRY *qglArrayElement)(GLint i);
 
 void (GLAPIENTRY *qglColor4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
 void (GLAPIENTRY *qglArrayElement)(GLint i);
 
 void (GLAPIENTRY *qglColor4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);

-void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t);
+void (GLAPIENTRY *qglTexCoord1f)(GLfloat s);

 void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t);
 void (GLAPIENTRY *qglTexCoord3f)(GLfloat s, GLfloat t, GLfloat r);
 void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t);
 void (GLAPIENTRY *qglTexCoord3f)(GLfloat s, GLfloat t, GLfloat r);

+void (GLAPIENTRY *qglTexCoord4f)(GLfloat s, GLfloat t, GLfloat r, GLfloat q);

 void (GLAPIENTRY *qglVertex2f)(GLfloat x, GLfloat y);
 void (GLAPIENTRY *qglVertex3f)(GLfloat x, GLfloat y, GLfloat z);
 void (GLAPIENTRY *qglBegin)(GLenum mode);
 void (GLAPIENTRY *qglVertex2f)(GLfloat x, GLfloat y);
 void (GLAPIENTRY *qglVertex3f)(GLfloat x, GLfloat y, GLfloat z);
 void (GLAPIENTRY *qglBegin)(GLenum mode);


@@ -405,8 +408,10 @@ static dllfunction_t opengl110funcs[] =
        {"glTexCoordPointer", (void **) &qglTexCoordPointer},
        {"glArrayElement", (void **) &qglArrayElement},
        {"glColor4f", (void **) &qglColor4f},
        {"glTexCoordPointer", (void **) &qglTexCoordPointer},
        {"glArrayElement", (void **) &qglArrayElement},
        {"glColor4f", (void **) &qglColor4f},

+       {"glTexCoord1f", (void **) &qglTexCoord1f},

        {"glTexCoord2f", (void **) &qglTexCoord2f},
        {"glTexCoord3f", (void **) &qglTexCoord3f},
        {"glTexCoord2f", (void **) &qglTexCoord2f},
        {"glTexCoord3f", (void **) &qglTexCoord3f},

+       {"glTexCoord4f", (void **) &qglTexCoord4f},

        {"glVertex2f", (void **) &qglVertex2f},
        {"glVertex3f", (void **) &qglVertex3f},
        {"glBegin", (void **) &qglBegin},
        {"glVertex2f", (void **) &qglVertex2f},
        {"glVertex3f", (void **) &qglVertex3f},
        {"glBegin", (void **) &qglBegin},


@@ -474,8 +479,10 @@ static dllfunction_t drawrangeelementsextfuncs[] =
 
 static dllfunction_t multitexturefuncs[] =
 {
 
 static dllfunction_t multitexturefuncs[] =
 {

+       {"glMultiTexCoord1fARB", (void **) &qglMultiTexCoord1f},

        {"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f},
        {"glMultiTexCoord3fARB", (void **) &qglMultiTexCoord3f},
        {"glMultiTexCoord2fARB", (void **) &qglMultiTexCoord2f},
        {"glMultiTexCoord3fARB", (void **) &qglMultiTexCoord3f},

+       {"glMultiTexCoord4fARB", (void **) &qglMultiTexCoord4f},

        {"glActiveTextureARB", (void **) &qglActiveTexture},
        {"glClientActiveTextureARB", (void **) &qglClientActiveTexture},
        {NULL, NULL}
        {"glActiveTextureARB", (void **) &qglActiveTexture},
        {"glClientActiveTextureARB", (void **) &qglClientActiveTexture},
        {NULL, NULL}


@@ -839,7 +846,7 @@ void VID_UpdateGamma(qboolean force)
         && cachewhite[1] == v_color_white_g.value
         && cachewhite[2] == v_color_white_b.value)
                return;
         && cachewhite[1] == v_color_white_g.value
         && cachewhite[2] == v_color_white_b.value)
                return;

-               
+

        forcenextframe = false;
 
        if (vid_activewindow && v_hwgamma.integer)
        forcenextframe = false;
 
        if (vid_activewindow && v_hwgamma.integer)


@@ -899,7 +906,7 @@ void VID_UpdateGamma(qboolean force)
                                        nt[x] = lhrandom(1, 8.2);
                                }
                        }
                                        nt[x] = lhrandom(1, 8.2);
                                }
                        }

-                       
+

                        for (x = 0;x < 3;x++)
                        {
                                nt[x] -= host_realframetime;
                        for (x = 0;x < 3;x++)
                        {
                                nt[x] -= host_realframetime;


@@ -911,7 +918,7 @@ void VID_UpdateGamma(qboolean force)
                                n[x] += nd[x] * host_realframetime;
                                n[x] -= floor(n[x]);
                        }
                                n[x] += nd[x] * host_realframetime;
                                n[x] -= floor(n[x]);
                        }

-               
+

                        for (x = 0, ramp = vid_gammaramps;x < 3;x++)
                                for (y = 0, t = n[x] - 0.75f;y < 256;y++, t += 0.75f * (2.0f / 256.0f))
                                        *ramp++ = cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f;
                        for (x = 0, ramp = vid_gammaramps;x < 3;x++)
                                for (y = 0, t = n[x] - 0.75f;y < 256;y++, t += 0.75f * (2.0f / 256.0f))
                                        *ramp++ = cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f;


@@ -960,7 +967,7 @@ void VID_Shared_Init(void)
        Cvar_RegisterVariable(&v_color_white_b);
 
        Cvar_RegisterVariable(&v_hwgamma);
        Cvar_RegisterVariable(&v_color_white_b);
 
        Cvar_RegisterVariable(&v_hwgamma);

-       
+

        Cvar_RegisterVariable(&v_psycho);
 
        Cvar_RegisterVariable(&vid_fullscreen);
        Cvar_RegisterVariable(&v_psycho);
 
        Cvar_RegisterVariable(&vid_fullscreen);