diff --git a/common/opengl.h b/common/opengl.h index 731a444d..855f4269 100755 --- a/common/opengl.h +++ b/common/opengl.h @@ -451,8 +451,6 @@ typedef ptrdiff_t GLsizeiptrARB; #endif // GL_ARB_vertex_buffer_object -#ifndef GL_ARB_vertex_buffer_object -#define GL_ARB_vertex_buffer_object 1 typedef void (APIENTRY *GLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); typedef void (APIENTRY *GLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); typedef void (APIENTRY *GLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers); @@ -464,7 +462,6 @@ typedef GLvoid* (APIENTRY *GLMAPBUFFERARBPROC) (GLenum target, GLenum access); typedef GLboolean (APIENTRY *GLUNMAPBUFFERARBPROC) (GLenum target); typedef void (APIENTRY *GLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params); typedef void (APIENTRY *GLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif // ============================================================================= // OpenGL extern declarations diff --git a/linux/dialogs.cpp b/linux/dialogs.cpp index e6210be5..51d7dc99 100644 --- a/linux/dialogs.cpp +++ b/linux/dialogs.cpp @@ -643,20 +643,12 @@ int aboutdlg_execute(void* param) else strcat(info, "No.\n"); - strcat(info, "Compiled Vertex Arrays: "); - if (GL_HasCompiledVertexArrays()) + strcat(info, "Vertex Buffer Objects: "); + if (GL_HasVertexBufferObject()) strcat(info, "Supported.\n"); else strcat(info, "Not supported.\n"); - strcat(info, "Multitexturing: "); - if (GL_GetMultiTextures() > 1) - { - sprintf(buf, "Supported, %i texture units.\n", GL_GetMultiTextures()); - strcat(info, buf); - } - else - strcat(info, "Not supported.\n"); glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value); sprintf(buf, "Maximum texture size: %ix%i", value, value); strcat(info, buf);