X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Flib%2Fnanogl%2FnanoGL.pas;h=47b783e53cfea591a3f3f75d42baa038b7a65634;hb=b1e7f99d9eea1711acf7471e9827500acccc5820;hp=d438beb4ae8a608a6406a3072d67bbbf10d01651;hpb=f4fc3b435118e5d9e4085da37014436d2e063259;p=d2df-sdl.git

diff --git a/src/lib/nanogl/nanoGL.pas b/src/lib/nanogl/nanoGL.pas
index d438beb..47b783e 100644
--- a/src/lib/nanogl/nanoGL.pas
+++ b/src/lib/nanogl/nanoGL.pas
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *)
 
-(* Sources: https://github.com/FWGS/nanogl *)
+(* Sources: https://github.com/DeaDDooMER/nanogl *)
 unit nanoGL;
 
 interface
@@ -34,24 +34,23 @@ const
 {$ENDIF}
 
 type
-  GLenum     = Cardinal;      PGLenum     = ^GLenum;
-  GLboolean  = Byte;          PGLboolean  = ^GLboolean;
-  GLbitfield = Cardinal;      PGLbitfield = ^GLbitfield;
-  GLbyte     = ShortInt;      PGLbyte     = ^GLbyte;
-  GLshort    = SmallInt;      PGLshort    = ^GLshort;
-  GLint      = Integer;       PGLint      = ^GLint;
-  GLsizei    = Integer;       PGLsizei    = ^GLsizei;
-  GLubyte    = Byte;          PGLubyte    = ^GLubyte;
-  GLushort   = Word;          PGLushort   = ^GLushort;
-  GLuint     = Cardinal;      PGLuint     = ^GLuint;
-  GLfloat    = Single;        PGLfloat    = ^GLfloat;
-  GLclampf   = Single;        PGLclampf   = ^GLclampf;
-  GLdouble   = Double;        PGLdouble   = ^GLdouble;
-  GLclampd   = Double;        PGLclampd   = ^GLclampd;
-{ GLvoid     = void; }        PGLvoid     = Pointer;
-                              PPGLvoid    = ^PGLvoid;
-  GLfixed    = Integer;       PGLfixed    = ^Integer;
-  GLclampx   = Integer;       PGLclampx   = ^Integer;
+  GLenum     = cuint;   PGLenum     = ^GLenum;
+  GLboolean  = cuchar;  PGLboolean  = ^GLboolean;
+  GLbitfield = cuint;   PGLbitfield = ^GLbitfield;
+  GLbyte     = cschar;  PGLbyte     = ^GLbyte;
+  GLshort    = cshort;  PGLshort    = ^GLshort;
+  GLint      = cint;    PGLint      = ^GLint;
+  GLsizei    = cint;    PGLsizei    = ^GLsizei;
+  GLubyte    = cuchar;  PGLubyte    = ^GLubyte;
+  GLushort   = cushort; PGLushort   = ^GLushort;
+  GLuint     = cuint;   PGLuint     = ^GLuint;
+  GLfloat    = cfloat;  PGLfloat    = ^GLfloat;
+  GLclampf   = cfloat;  PGLclampf   = ^GLclampf;
+  GLdouble   = cdouble; PGLdouble   = ^GLdouble;
+  GLclampd   = cdouble; PGLclampd   = ^GLclampd;
+{ GLvoid     = void; }  PGLvoid     = Pointer;     PPGLvoid = ^PGLvoid;
+  GLfixed    = cint;    PGLfixed    = ^Integer;
+  GLclampx   = cint;    PGLclampx   = ^Integer;
 
   TGLenum     = GLenum;
   TGLboolean  = GLboolean;
@@ -753,6 +752,9 @@ procedure glGenBuffersARB(count: Gluint; indexes: PGLuint); cdecl; external nano
 procedure glDeleteBuffersARB(count: GLuint; indexes: PGLuint); cdecl; external nanoGL_LibName;
 procedure glBufferDataARB(target: GLuint; size: GLuint; buffer: PGLvoid; _type: GLuint); cdecl; external nanoGL_LibName;
 procedure glBufferSubDataARB(target: GLuint; offset: GLsizei; size: GLsizei; buffer: PGLvoid); cdecl; external nanoGL_LibName;
+function  glIsEnabled(cap: GLenum): GLboolean; external nanoGL_LibName;
+procedure glPushAttrib(mask: GLbitfield); external nanoGL_LibName;
+procedure glPopAttrib; external nanoGL_LibName;
 
 function nanoGL_Init(): CInt; cdecl; external nanoGL_LibName;
 procedure nanoGL_Destroy; cdecl; external nanoGL_LibName;
@@ -791,7 +793,7 @@ end;
 
 procedure glTexCoord2i(s, t: GLint);
 begin
-  glTexCoord2f(1 / s, 1 / t);
+  glTexCoord2f(s, t);
 end;
 
 end.