removed 1D texture management code, not used by anything

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

diff --git a/gl_backend.c b/gl_backend.c
index 955ac372631ca3b989dc8dae99e5f6e25480bd3d..ed8a3f6d58013f2bde5e5d7bc06472fcea46815c 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -607,7 +607,7 @@ typedef struct gltextureunit_s
        const void *pointer_texcoord;
        size_t pointer_texcoord_offset;
        int pointer_texcoord_buffer;
-       int t1d, t2d, t3d, tcubemap, trectangle;
+       int t2d, t3d, tcubemap, trectangle;
        int arrayenabled;
        unsigned int arraycomponents;
        int rgbscale, alphascale;
@@ -683,7 +683,6 @@ void GL_SetupTextureState(void)
        for (i = 0;i < MAX_TEXTUREUNITS;i++)
        {
                unit = gl_state.units + i;
-               unit->t1d = 0;
                unit->t2d = 0;
                unit->t3d = 0;
                unit->tcubemap = 0;
@@ -703,7 +702,6 @@ void GL_SetupTextureState(void)
        for (i = 0;i < backendimageunits;i++)
        {
                GL_ActiveTexture(i);
-               qglBindTexture(GL_TEXTURE_1D, 0);CHECKGLERROR
                qglBindTexture(GL_TEXTURE_2D, 0);CHECKGLERROR
                if (gl_texture3d)
                {
@@ -730,7 +728,6 @@ void GL_SetupTextureState(void)
        for (i = 0;i < backendunits;i++)
        {
                GL_ActiveTexture(i);
-               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
                qglDisable(GL_TEXTURE_2D);CHECKGLERROR
                if (gl_texture3d)
                {
@@ -1457,7 +1454,6 @@ void R_Mesh_Finish(void)
        for (i = 0;i < backendimageunits;i++)
        {
                GL_ActiveTexture(i);
-               qglBindTexture(GL_TEXTURE_1D, 0);CHECKGLERROR
                qglBindTexture(GL_TEXTURE_2D, 0);CHECKGLERROR
                if (gl_texture3d)
                {
@@ -1480,7 +1476,6 @@ void R_Mesh_Finish(void)
        for (i = 0;i < backendunits;i++)
        {
                GL_ActiveTexture(backendunits - 1 - i);
-               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
                qglDisable(GL_TEXTURE_2D);CHECKGLERROR
                if (gl_texture3d)
                {
@@ -1695,30 +1690,6 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendimageunits)
                return;
-       // update 1d texture binding
-       if (unit->t1d != tex1d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (tex1d)
-                       {
-                               if (unit->t1d == 0)
-                               {
-                                       qglEnable(GL_TEXTURE_1D);CHECKGLERROR
-                               }
-                       }
-                       else
-                       {
-                               if (unit->t1d)
-                               {
-                                       qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                               }
-                       }
-               }
-               unit->t1d = tex1d;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
        // update 2d texture binding
        if (unit->t2d != tex2d)
        {
@@ -1817,112 +1788,11 @@ void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, in
        }
 }
 
-void R_Mesh_TexBind1D(unsigned int unitnum, int texnum)
-{
-       gltextureunit_t *unit = gl_state.units + unitnum;
-       if (unitnum >= backendimageunits)
-               return;
-       // update 1d texture binding
-       if (unit->t1d != texnum)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (texnum)
-                       {
-                               if (unit->t1d == 0)
-                               {
-                                       qglEnable(GL_TEXTURE_1D);CHECKGLERROR
-                               }
-                       }
-                       else
-                       {
-                               if (unit->t1d)
-                               {
-                                       qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                               }
-                       }
-               }
-               unit->t1d = texnum;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
-       // update 2d texture binding
-       if (unit->t2d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t2d)
-                       {
-                               qglDisable(GL_TEXTURE_2D);CHECKGLERROR
-                       }
-               }
-               unit->t2d = 0;
-               qglBindTexture(GL_TEXTURE_2D, unit->t2d);CHECKGLERROR
-       }
-       // update 3d texture binding
-       if (unit->t3d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t3d)
-                       {
-                               qglDisable(GL_TEXTURE_3D);CHECKGLERROR
-                       }
-               }
-               unit->t3d = 0;
-               qglBindTexture(GL_TEXTURE_3D, unit->t3d);CHECKGLERROR
-       }
-       // update cubemap texture binding
-       if (unit->tcubemap)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->tcubemap)
-                       {
-                               qglDisable(GL_TEXTURE_CUBE_MAP_ARB);CHECKGLERROR
-                       }
-               }
-               unit->tcubemap = 0;
-               qglBindTexture(GL_TEXTURE_CUBE_MAP_ARB, unit->tcubemap);CHECKGLERROR
-       }
-       // update rectangle texture binding
-       if (unit->trectangle)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->trectangle)
-                       {
-                               qglDisable(GL_TEXTURE_RECTANGLE_ARB);CHECKGLERROR
-                       }
-               }
-               unit->trectangle = 0;
-               qglBindTexture(GL_TEXTURE_RECTANGLE_ARB, unit->trectangle);CHECKGLERROR
-       }
-}
-
 void R_Mesh_TexBind(unsigned int unitnum, int texnum)
 {
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendimageunits)
                return;
-       // update 1d texture binding
-       if (unit->t1d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t1d)
-                       {
-                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                       }
-               }
-               unit->t1d = 0;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
        // update 2d texture binding
        if (unit->t2d != texnum)
        {
@@ -1996,20 +1866,6 @@ void R_Mesh_TexBind3D(unsigned int unitnum, int texnum)
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendimageunits)
                return;
-       // update 1d texture binding
-       if (unit->t1d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t1d)
-                       {
-                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                       }
-               }
-               unit->t1d = 0;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
        // update 2d texture binding
        if (unit->t2d)
        {
@@ -2083,20 +1939,6 @@ void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum)
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendimageunits)
                return;
-       // update 1d texture binding
-       if (unit->t1d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t1d)
-                       {
-                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                       }
-               }
-               unit->t1d = 0;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
        // update 2d texture binding
        if (unit->t2d)
        {
@@ -2170,20 +2012,6 @@ void R_Mesh_TexBindRectangle(unsigned int unitnum, int texnum)
        gltextureunit_t *unit = gl_state.units + unitnum;
        if (unitnum >= backendimageunits)
                return;
-       // update 1d texture binding
-       if (unit->t1d)
-       {
-               GL_ActiveTexture(unitnum);
-               if (unitnum < backendunits)
-               {
-                       if (unit->t1d)
-                       {
-                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                       }
-               }
-               unit->t1d = 0;
-               qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-       }
        // update 2d texture binding
        if (unit->t2d)
        {
@@ -2389,17 +2217,6 @@ void R_Mesh_ResetTextureState(void)
        for (unitnum = 0;unitnum < backendimageunits;unitnum++)
        {
                gltextureunit_t *unit = gl_state.units + unitnum;
-               // update 1d texture binding
-               if (unit->t1d)
-               {
-                       GL_ActiveTexture(unitnum);
-                       if (unitnum < backendunits)
-                       {
-                               qglDisable(GL_TEXTURE_1D);CHECKGLERROR
-                       }
-                       unit->t1d = 0;
-                       qglBindTexture(GL_TEXTURE_1D, unit->t1d);CHECKGLERROR
-               }
                // update 2d texture binding
                if (unit->t2d)
                {

diff --git a/gl_backend.h b/gl_backend.h
index 6332865b26900d940526eadc393e03c5d603580f..4d0ccf4da337be10e3f9a892c382091e6aaaefb4 100644 (file)
--- a/gl_backend.h
+++ b/gl_backend.h
@@ -105,7 +105,6 @@ void R_Mesh_TexCoordPointer(unsigned int unitnum, unsigned int numcomponents, co
 void R_Mesh_TexBindAll(unsigned int unitnum, int tex1d, int tex2d, int tex3d, int texcubemap, int texrectangle);
 // sets these are like TexBindAll with only one of the texture indices non-zero
 // (binds one texture type and unbinds all other types)
-void R_Mesh_TexBind1D(unsigned int unitnum, int texnum);
 void R_Mesh_TexBind(unsigned int unitnum, int texnum);
 void R_Mesh_TexBind3D(unsigned int unitnum, int texnum);
 void R_Mesh_TexBindCubeMap(unsigned int unitnum, int texnum);

diff --git a/gl_textures.c b/gl_textures.c
index bc6494e8735c57cfb4563d19fa0544cb5bc227a9..94d0461662ef03e405200b372f18b11f1ffcc836 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -65,7 +65,6 @@ static textypeinfo_t textype_shadowmap24            = {TEXTYPE_SHADOWMAP,4,4, 4.
 
 typedef enum gltexturetype_e
 {
-       GLTEXTURETYPE_1D,
        GLTEXTURETYPE_2D,
        GLTEXTURETYPE_3D,
        GLTEXTURETYPE_CUBEMAP,
@@ -74,9 +73,9 @@ typedef enum gltexturetype_e
 }
 gltexturetype_t;
 
-static int gltexturetypeenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_RECTANGLE_ARB};
-static int gltexturetypebindingenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_BINDING_1D, GL_TEXTURE_BINDING_2D, GL_TEXTURE_BINDING_3D, GL_TEXTURE_BINDING_CUBE_MAP_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB};
-static int gltexturetypedimensions[GLTEXTURETYPE_TOTAL] = {1, 2, 3, 2, 2};
+static int gltexturetypeenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_RECTANGLE_ARB};
+static int gltexturetypebindingenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_BINDING_2D, GL_TEXTURE_BINDING_3D, GL_TEXTURE_BINDING_CUBE_MAP_ARB, GL_TEXTURE_BINDING_RECTANGLE_ARB};
+static int gltexturetypedimensions[GLTEXTURETYPE_TOTAL] = {2, 3, 2, 2};
 static int cubemapside[6] =
 {
        GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB,
@@ -420,7 +419,6 @@ static void GL_Texture_CalcImageSize(int texturetype, int flags, int inwidth, in
        switch (texturetype)
        {
        default:
-       case GLTEXTURETYPE_1D:
        case GLTEXTURETYPE_2D:
                maxsize = gl_max_texture_size;
                break;
@@ -813,9 +811,6 @@ static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int
                // update a portion of the image
                switch(glt->texturetype)
                {
-               case GLTEXTURETYPE_1D:
-                       qglTexSubImage1D(GL_TEXTURE_1D, 0, fragx, fragwidth, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
-                       break;
                case GLTEXTURETYPE_2D:
                        qglTexSubImage2D(GL_TEXTURE_2D, 0, fragx, fragy, fragwidth, fragheight, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
                        break;
@@ -823,7 +818,7 @@ static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int
                        qglTexSubImage3D(GL_TEXTURE_3D, 0, fragx, fragy, fragz, fragwidth, fragheight, fragdepth, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
                        break;
                default:
-                       Host_Error("R_Upload: partial update of type other than 1D, 2D, or 3D");
+                       Host_Error("R_Upload: partial update of type other than 2D");
                        break;
                }
        }
@@ -861,18 +856,6 @@ static void R_Upload(gltexture_t *glt, const unsigned char *data, int fragx, int
                }
                switch(glt->texturetype)
                {
-               case GLTEXTURETYPE_1D:
-                       qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
-                       if (glt->flags & TEXF_MIPMAP)
-                       {
-                               while (width > 1 || height > 1 || depth > 1)
-                               {
-                                       Image_MipReduce32(prevbuffer, resizebuffer, &width, &height, &depth, 1, 1, 1);
-                                       prevbuffer = resizebuffer;
-                                       qglTexImage1D(GL_TEXTURE_1D, mip++, glt->glinternalformat, width, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
-                               }
-                       }
-                       break;
                case GLTEXTURETYPE_2D:
                        qglTexImage2D(GL_TEXTURE_2D, mip++, glt->glinternalformat, width, height, 0, glt->glformat, glt->gltype, prevbuffer);CHECKGLERROR
                        if (glt->flags & TEXF_MIPMAP)
@@ -1117,11 +1100,6 @@ static rtexture_t *R_SetupTexture(rtexturepool_t *rtexturepool, const char *iden
        return (rtexture_t *)glt;
 }
 
-rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette)
-{
-       return R_SetupTexture(rtexturepool, identifier, width, 1, 1, 1, flags, textype, GLTEXTURETYPE_1D, data, palette);
-}
-
 rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette)
 {
        return R_SetupTexture(rtexturepool, identifier, width, height, 1, 1, flags, textype, GLTEXTURETYPE_2D, data, palette);

diff --git a/glquake.h b/glquake.h
index fc00eecc28c3cf2930f5a462ddbe90f374297571..1a56be0854ec1f4e25cbbd5d094a4b884a98a765 100644 (file)
--- a/glquake.h
+++ b/glquake.h
@@ -606,7 +606,7 @@ extern void (GLAPIENTRY *qglBindFramebufferEXT)(GLenum target, GLuint framebuffe
 extern void (GLAPIENTRY *qglDeleteFramebuffersEXT)(GLsizei n, const GLuint *framebuffers);
 extern void (GLAPIENTRY *qglGenFramebuffersEXT)(GLsizei n, GLuint *framebuffers);
 extern GLenum (GLAPIENTRY *qglCheckFramebufferStatusEXT)(GLenum target);
-extern void (GLAPIENTRY *qglFramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+//extern void (GLAPIENTRY *qglFramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
 extern void (GLAPIENTRY *qglFramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
 extern void (GLAPIENTRY *qglFramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
 extern void (GLAPIENTRY *qglFramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
@@ -708,13 +708,13 @@ extern GLboolean (GLAPIENTRY *qglIsTexture)(GLuint texture);
 extern void (GLAPIENTRY *qglPixelStoref)(GLenum pname, GLfloat param);
 extern void (GLAPIENTRY *qglPixelStorei)(GLenum pname, GLint param);
 
-extern void (GLAPIENTRY *qglTexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+//extern void (GLAPIENTRY *qglTexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 extern void (GLAPIENTRY *qglTexImage2D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-extern void (GLAPIENTRY *qglTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+//extern void (GLAPIENTRY *qglTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
 extern void (GLAPIENTRY *qglTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-extern void (GLAPIENTRY *qglCopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+//extern void (GLAPIENTRY *qglCopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
 extern void (GLAPIENTRY *qglCopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-extern void (GLAPIENTRY *qglCopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+//extern void (GLAPIENTRY *qglCopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
 extern void (GLAPIENTRY *qglCopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 
 extern void (GLAPIENTRY *qglPolygonOffset)(GLfloat factor, GLfloat units);
@@ -911,10 +911,10 @@ extern int gl_support_shading_language_100;
 extern int gl_support_texture_compression;
 extern void (GLAPIENTRY *qglCompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
 extern void (GLAPIENTRY *qglCompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border,  GLsizei imageSize, const void *data);
-extern void (GLAPIENTRY *qglCompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+//extern void (GLAPIENTRY *qglCompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
 extern void (GLAPIENTRY *qglCompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
 extern void (GLAPIENTRY *qglCompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
-extern void (GLAPIENTRY *qglCompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+//extern void (GLAPIENTRY *qglCompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
 extern void (GLAPIENTRY *qglGetCompressedTexImageARB)(GLenum target, GLint lod, void *img);
 #ifndef GL_COMPRESSED_RGB_ARB
 #define GL_COMPRESSED_ALPHA_ARB                                                0x84E9

diff --git a/r_textures.h b/r_textures.h
index ec2da990d004db2040aadd88d69612b2a2c68a3e..e5ba73069bf2b7d576e2f8f312c00252ea564e86 100644 (file)
--- a/r_textures.h
+++ b/r_textures.h
@@ -79,7 +79,6 @@ extern cvar_t gl_texturecompression_lightcubemaps;
 // add a texture to a pool and optionally precache (upload) it
 // (note: data == NULL is perfectly acceptable)
 // (note: palette must not be NULL if using TEXTYPE_PALETTE)
-rtexture_t *R_LoadTexture1D(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette);
 rtexture_t *R_LoadTexture2D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette);
 rtexture_t *R_LoadTexture3D(rtexturepool_t *rtexturepool, const char *identifier, int width, int height, int depth, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette);
 rtexture_t *R_LoadTextureCubeMap(rtexturepool_t *rtexturepool, const char *identifier, int width, const unsigned char *data, textype_t textype, int flags, const unsigned int *palette);

diff --git a/vid_shared.c b/vid_shared.c
index 2af2694351df95a99372fa80b571c21224259c77..bf50107821f8dff1140dff0514c2787743dfeca4 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -255,13 +255,13 @@ GLboolean (GLAPIENTRY *qglIsTexture)(GLuint texture);
 void (GLAPIENTRY *qglPixelStoref)(GLenum pname, GLfloat param);
 void (GLAPIENTRY *qglPixelStorei)(GLenum pname, GLint param);
 
-void (GLAPIENTRY *qglTexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+//void (GLAPIENTRY *qglTexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
 void (GLAPIENTRY *qglTexImage2D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-void (GLAPIENTRY *qglTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
+//void (GLAPIENTRY *qglTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
 void (GLAPIENTRY *qglTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-void (GLAPIENTRY *qglCopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+//void (GLAPIENTRY *qglCopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
 void (GLAPIENTRY *qglCopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-void (GLAPIENTRY *qglCopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+//void (GLAPIENTRY *qglCopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
 void (GLAPIENTRY *qglCopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
 
 
@@ -401,7 +401,7 @@ void (GLAPIENTRY *qglBindFramebufferEXT)(GLenum target, GLuint framebuffer);
 void (GLAPIENTRY *qglDeleteFramebuffersEXT)(GLsizei n, const GLuint *framebuffers);
 void (GLAPIENTRY *qglGenFramebuffersEXT)(GLsizei n, GLuint *framebuffers);
 GLenum (GLAPIENTRY *qglCheckFramebufferStatusEXT)(GLenum target);
-void (GLAPIENTRY *qglFramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+//void (GLAPIENTRY *qglFramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
 void (GLAPIENTRY *qglFramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
 void (GLAPIENTRY *qglFramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
 void (GLAPIENTRY *qglFramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
@@ -410,10 +410,10 @@ void (GLAPIENTRY *qglGenerateMipmapEXT)(GLenum target);
 
 void (GLAPIENTRY *qglCompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
 void (GLAPIENTRY *qglCompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border,  GLsizei imageSize, const void *data);
-void (GLAPIENTRY *qglCompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+//void (GLAPIENTRY *qglCompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
 void (GLAPIENTRY *qglCompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
 void (GLAPIENTRY *qglCompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
-void (GLAPIENTRY *qglCompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+//void (GLAPIENTRY *qglCompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
 void (GLAPIENTRY *qglGetCompressedTexImageARB)(GLenum target, GLint lod, void *img);
 
 void (GLAPIENTRY *qglGenQueriesARB)(GLsizei n, GLuint *ids);
@@ -584,13 +584,13 @@ static dllfunction_t opengl110funcs[] =
 //     {"glPrioritizeTextures", (void **) &qglPrioritizeTextures},
 //     {"glAreTexturesResident", (void **) &qglAreTexturesResident},
        {"glIsTexture", (void **) &qglIsTexture},
-       {"glTexImage1D", (void **) &qglTexImage1D},
+//     {"glTexImage1D", (void **) &qglTexImage1D},
        {"glTexImage2D", (void **) &qglTexImage2D},
-       {"glTexSubImage1D", (void **) &qglTexSubImage1D},
+//     {"glTexSubImage1D", (void **) &qglTexSubImage1D},
        {"glTexSubImage2D", (void **) &qglTexSubImage2D},
-       {"glCopyTexImage1D", (void **) &qglCopyTexImage1D},
+//     {"glCopyTexImage1D", (void **) &qglCopyTexImage1D},
        {"glCopyTexImage2D", (void **) &qglCopyTexImage2D},
-       {"glCopyTexSubImage1D", (void **) &qglCopyTexSubImage1D},
+//     {"glCopyTexSubImage1D", (void **) &qglCopyTexSubImage1D},
        {"glCopyTexSubImage2D", (void **) &qglCopyTexSubImage2D},
        {"glScissor", (void **) &qglScissor},
        {"glPolygonOffset", (void **) &qglPolygonOffset},
@@ -786,7 +786,7 @@ static dllfunction_t fbofuncs[] =
        {"glDeleteFramebuffersEXT"                  , (void **) &qglDeleteFramebuffersEXT},
        {"glGenFramebuffersEXT"                     , (void **) &qglGenFramebuffersEXT},
        {"glCheckFramebufferStatusEXT"              , (void **) &qglCheckFramebufferStatusEXT},
-       {"glFramebufferTexture1DEXT"                , (void **) &qglFramebufferTexture1DEXT},
+//     {"glFramebufferTexture1DEXT"                , (void **) &qglFramebufferTexture1DEXT},
        {"glFramebufferTexture2DEXT"                , (void **) &qglFramebufferTexture2DEXT},
        {"glFramebufferTexture3DEXT"                , (void **) &qglFramebufferTexture3DEXT},
        {"glFramebufferRenderbufferEXT"             , (void **) &qglFramebufferRenderbufferEXT},
@@ -799,10 +799,10 @@ static dllfunction_t texturecompressionfuncs[] =
 {
        {"glCompressedTexImage3DARB",    (void **) &qglCompressedTexImage3DARB},
        {"glCompressedTexImage2DARB",    (void **) &qglCompressedTexImage2DARB},
-       {"glCompressedTexImage1DARB",    (void **) &qglCompressedTexImage1DARB},
+//     {"glCompressedTexImage1DARB",    (void **) &qglCompressedTexImage1DARB},
        {"glCompressedTexSubImage3DARB", (void **) &qglCompressedTexSubImage3DARB},
        {"glCompressedTexSubImage2DARB", (void **) &qglCompressedTexSubImage2DARB},
-       {"glCompressedTexSubImage1DARB", (void **) &qglCompressedTexSubImage1DARB},
+//     {"glCompressedTexSubImage1DARB", (void **) &qglCompressedTexSubImage1DARB},
        {"glGetCompressedTexImageARB",   (void **) &qglGetCompressedTexImageARB},
        {NULL, NULL}
 };