Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2025-01-18 22:26:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Linux fixes.

Browse source
This commit is contained in:
leo 2012-04-13 19:15:58 +00:00
parent 775ad35d65
commit 998abfb66a
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/opengl.h
View file

@ -451,8 +451,6 @@ typedef ptrdiff_t GLsizeiptrARB;
#endif #endif
// GL_ARB_vertex_buffer_object // 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 *GLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
typedef void (APIENTRY *GLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); typedef void (APIENTRY *GLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
typedef void (APIENTRY *GLGENBUFFERSARBPROC) (GLsizei n, 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 GLboolean (APIENTRY *GLUNMAPBUFFERARBPROC) (GLenum target);
typedef void (APIENTRY *GLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params); typedef void (APIENTRY *GLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
typedef void (APIENTRY *GLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params); typedef void (APIENTRY *GLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params);
#endif
// ============================================================================= // =============================================================================
// OpenGL extern declarations // OpenGL extern declarations

12
linux/dialogs.cpp
View file

@ -643,20 +643,12 @@ int aboutdlg_execute(void* param)
else else
strcat(info, "No.\n"); strcat(info, "No.\n");
strcat(info, "Compiled Vertex Arrays: "); strcat(info, "Vertex Buffer Objects: ");
if (GL_HasCompiledVertexArrays()) if (GL_HasVertexBufferObject())
strcat(info, "Supported.\n"); strcat(info, "Supported.\n");
else else
strcat(info, "Not supported.\n"); 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); glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
sprintf(buf, "Maximum texture size: %ix%i", value, value); sprintf(buf, "Maximum texture size: %ix%i", value, value);
strcat(info, buf); strcat(info, buf);