X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=a65d5a72f3ea3890e5c92479dc4cf7abbd511221;hb=23c506a3c99de3aea806132979ab8f8abd0208da;hp=55efef3557bb510d8a612182fa8edf2256faa986;hpb=cd84535c9bee3c6e7afe080953e609b64bbaa7ac;p=xonotic%2Fdarkplaces.git diff --git a/vid_shared.c b/vid_shared.c index 55efef35..a65d5a72 100644 --- a/vid_shared.c +++ b/vid_shared.c @@ -146,9 +146,10 @@ void (GLAPIENTRY *qglStencilMask)(GLuint mask); void (GLAPIENTRY *qglStencilOp)(GLenum fail, GLenum zfail, GLenum zpass); void (GLAPIENTRY *qglClearStencil)(GLint s); -//void (GLAPIENTRY *qglTexEnvf)(GLenum target, GLenum pname, GLfloat param); +void (GLAPIENTRY *qglTexEnvf)(GLenum target, GLenum pname, GLfloat param); void (GLAPIENTRY *qglTexEnvi)(GLenum target, GLenum pname, GLint param); -//void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param); +void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param); +void (GLAPIENTRY *qglTexParameterfv)(GLenum target, GLenum pname, GLfloat *params); void (GLAPIENTRY *qglTexParameteri)(GLenum target, GLenum pname, GLint param); void (GLAPIENTRY *qglGenTextures)(GLsizei n, GLuint *textures); @@ -281,9 +282,10 @@ static gl_extensionfunctionlist_t opengl110funcs[] = {"glStencilMask", (void **) &qglStencilMask}, {"glStencilOp", (void **) &qglStencilOp}, {"glClearStencil", (void **) &qglClearStencil}, -// {"glTexEnvf", (void **) &qglTexEnvf}, + {"glTexEnvf", (void **) &qglTexEnvf}, {"glTexEnvi", (void **) &qglTexEnvi}, -// {"glTexParameterf", (void **) &qglTexParameterf}, + {"glTexParameterf", (void **) &qglTexParameterf}, + {"glTexParameterfv", (void **) &qglTexParameterfv}, {"glTexParameteri", (void **) &qglTexParameteri}, {"glPixelStoref", (void **) &qglPixelStoref}, {"glPixelStorei", (void **) &qglPixelStorei}, @@ -331,7 +333,7 @@ static gl_extensionfunctionlist_t compiledvertexarrayfuncs[] = {NULL, NULL} }; -static gl_extensionfunctionlist_t texture3dfuncs[] = +static gl_extensionfunctionlist_t texture3dextfuncs[] = { {"glTexImage3DEXT", (void **) &qglTexImage3D}, {"glTexSubImage3DEXT", (void **) &qglTexSubImage3D}, @@ -369,7 +371,7 @@ void VID_CheckExtensions(void) 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("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);