now checks for both TexImage3D built into the OpenGL library and for GL_EXT_texture3D...

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

diff --git a/vid_shared.c b/vid_shared.c
index 55efef3557bb510d8a612182fa8edf2256faa986..00c94858556f54bb38ddae2ca5ea5e18c0991471 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -332,6 +332,14 @@ static gl_extensionfunctionlist_t compiledvertexarrayfuncs[] =
 };
 
 static gl_extensionfunctionlist_t texture3dfuncs[] =
 };
 
 static gl_extensionfunctionlist_t texture3dfuncs[] =

+{
+       {"glTexImage3D", (void **) &qglTexImage3D},
+       {"glTexSubImage3D", (void **) &qglTexSubImage3D},
+       {"glCopyTexSubImage3D", (void **) &qglCopyTexSubImage3D},
+       {NULL, NULL}
+};
+
+static gl_extensionfunctionlist_t texture3dextfuncs[] =

 {
        {"glTexImage3DEXT", (void **) &qglTexImage3D},
        {"glTexSubImage3DEXT", (void **) &qglTexSubImage3D},
 {
        {"glTexImage3DEXT", (void **) &qglTexImage3D},
        {"glTexSubImage3DEXT", (void **) &qglTexSubImage3D},


@@ -369,7 +377,7 @@ void VID_CheckExtensions(void)
                        gl_dot3arb = GL_CheckExtension("GL_ARB_texture_env_dot3", NULL, "-nodot3", false);
        }
 
                        gl_dot3arb = GL_CheckExtension("GL_ARB_texture_env_dot3", NULL, "-nodot3", false);
        }
 

-       gl_texture3d = GL_CheckExtension("GL_EXT_texture3D", texture3dfuncs, "-notexture3d", false);
+       gl_texture3d = GL_CheckExtension("glTexImage3D", texture3dfuncs, "-notexture3d", false) || GL_CheckExtension("GL_EXT_texture3D", texture3dextfuncs, "-notexture3d", false);

        gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false);
        gl_supportslockarrays = GL_CheckExtension("GL_EXT_compiled_vertex_array", compiledvertexarrayfuncs, "-nocva", false);
 
        gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false);
        gl_supportslockarrays = GL_CheckExtension("GL_EXT_compiled_vertex_array", compiledvertexarrayfuncs, "-nocva", false);