From b9fc96073b970ea52791df9b282929c7c12d5a4c Mon Sep 17 00:00:00 2001 From: michael Date: Sun, 22 May 2005 08:39:24 +0000 Subject: [PATCH] * Fixes from Michalis Kamburelis: 1. Fixes declarations of glGetMapiv, glGetMaterialiv and glLightiv to take pointer as the last parameter. 2. Changes glGetString, gluErrorString and gluGetString to return PChar instead of PGLubyte. git-svn-id: trunk@58 - --- packages/extra/opengl/gl.pp | 8 ++++---- packages/extra/opengl/glu.pp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/extra/opengl/gl.pp b/packages/extra/opengl/gl.pp index c586b9b74b..56119c6714 100644 --- a/packages/extra/opengl/gl.pp +++ b/packages/extra/opengl/gl.pp @@ -1270,15 +1270,15 @@ var glGetLightiv: procedure(light, pname: GLenum; params: PGLint); extdecl; glGetMapdv: procedure(target, query: GLenum; v: PGLdouble); extdecl; glGetMapfv: procedure(target, query: GLenum; v: PGLfloat); extdecl; - glGetMapiv: procedure(target, query: GLenum; v: GLint); extdecl; + glGetMapiv: procedure(target, query: GLenum; v: PGLint); extdecl; glGetMaterialfv: procedure(face, pname: GLenum; params: PGLfloat); extdecl; - glGetMaterialiv: procedure(face, pname: GLenum; params: GLint); extdecl; + glGetMaterialiv: procedure(face, pname: GLenum; params: PGLint); extdecl; glGetPixelMapfv: procedure(map: GLenum; values: PGLfloat); extdecl; glGetPixelMapuiv: procedure(map: GLenum; values: PGLuint); extdecl; glGetPixelMapusv: procedure(map: GLenum; values: PGLushort); extdecl; glGetPointerv: procedure(pname: GLenum; params: Pointer); extdecl; glGetPolygonStipple: procedure(mask: PGLubyte); extdecl; - glGetString: function(name: GLenum): PGLubyte; extdecl; + glGetString: function(name: GLenum): PChar; extdecl; glGetTexEnvfv: procedure(target, pname: GLenum; params: PGLfloat); extdecl; glGetTexEnviv: procedure(target, pname: GLenum; params: PGLint); extdecl; glGetTexGendv: procedure(coord, pname: GLenum; params: PGLdouble); extdecl; @@ -1314,7 +1314,7 @@ var glLightf: procedure(light, pname: GLenum; param: GLfloat); extdecl; glLightfv: procedure(light, pname: GLenum; const params: PGLfloat); extdecl; glLighti: procedure(light, pname: GLenum; param: GLint); extdecl; - glLightiv: procedure(light, pname: GLenum; const params: GLint); extdecl; + glLightiv: procedure(light, pname: GLenum; const params: PGLint); extdecl; glLineStipple: procedure(factor: GLint; pattern: GLushort); extdecl; glLineWidth: procedure(width: GLfloat); extdecl; glListBase: procedure(base: GLuint); extdecl; diff --git a/packages/extra/opengl/glu.pp b/packages/extra/opengl/glu.pp index 2a00f817bb..b64096a9f6 100644 --- a/packages/extra/opengl/glu.pp +++ b/packages/extra/opengl/glu.pp @@ -83,9 +83,9 @@ type PPointer = ^Pointer; var - gluErrorString: function(errCode: GLenum): PGLubyte; extdecl; + gluErrorString: function(errCode: GLenum): PChar; extdecl; gluErrorUnicodeStringEXT: function(errCode: GLenum): PWideChar; extdecl; - gluGetString: function(name: GLenum): PGLubyte; extdecl; + gluGetString: function(name: GLenum): PChar; extdecl; gluOrtho2D: procedure(left,right, bottom, top: GLdouble); extdecl; gluPerspective: procedure(fovy, aspect, zNear, zFar: GLdouble); extdecl; gluPickMatrix: procedure(x, y, width, height: GLdouble; var viewport: TViewPortArray); extdecl;