From: Bergmann89 <bergmann89@muo-game.de>
Date: Mon, 22 Sep 2014 16:04:36 +0000 (+0200)
Subject: * fixed some errors
X-Git-Url: https://git.delphigl.com/?a=commitdiff_plain;h=83d5fbb406dd837835f70f808717cb5ee6d0f89b;p=LazOpenGLCore.git

* fixed some errors
---

diff --git a/dglOpenGL.pas b/dglOpenGL.pas
index 09fd40d..83470c6 100644
--- a/dglOpenGL.pas
+++ b/dglOpenGL.pas
@@ -3011,6 +3011,7 @@ const
 
   // GL_ARB_imaging
   GL_CONSTANT_COLOR_ARB = $8001;
+  GL_CONSTANT_COLOR = $8001;
   GL_ONE_MINUS_CONSTANT_COLOR = $8002;
   GL_CONSTANT_ALPHA = $8003;
   GL_ONE_MINUS_CONSTANT_ALPHA = $8004;
@@ -14968,7 +14969,7 @@ end;
 
 function Int_GetExtensionString: AnsiString;
 var
-	ExtensionCount : GLuint;
+	ExtensionCount : GLint;
   i : Integer;
 begin
   if GL_VERSION_3_0
diff --git a/uglcBitmap.pas b/uglcBitmap.pas
index d9b0b97..42c7708 100644
--- a/uglcBitmap.pas
+++ b/uglcBitmap.pas
@@ -217,11 +217,11 @@ History
 25-07-2003
 - begin of programming
 ***********************************************************}
-unit glBitmap;
+unit uglcBitmap;
 
 // Please uncomment the defines below to configure the glBitmap to your preferences.
 // If you have configured the unit you can uncomment the warning above.
-{$MESSAGE error 'Hey. I''m the glBitmap.pas and i need to be configured. My master tell me your preferences! ;)'}
+{.$MESSAGE error 'Hey. I''m the glBitmap.pas and i need to be configured. My master tell me your preferences! ;)'}
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Preferences ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -242,7 +242,7 @@ unit glBitmap;
 {.$DEFINE GLB_DELPHI}
 
 // activate to enable the support for TLazIntfImage from Lazarus
-{.$DEFINE GLB_LAZARUS}
+{$DEFINE GLB_LAZARUS}
 
 
 
@@ -254,7 +254,7 @@ unit glBitmap;
 
 // activate to enable Lazarus TPortableNetworkGraphic support
 // if you enable this pngImage and libPNG will be ignored
-{.$DEFINE GLB_LAZ_PNG}
+{$DEFINE GLB_LAZ_PNG}
 
 // activate to enable png support with the unit pngimage -> http://pngdelphi.sourceforge.net/
 // if you enable pngimage the libPNG will be ignored
@@ -268,7 +268,7 @@ unit glBitmap;
 
 // activate to enable Lazarus TJPEGImage support
 // if you enable this delphi jpegs and libJPEG will be ignored
-{.$DEFINE GLB_LAZ_JPEG}
+{$DEFINE GLB_LAZ_JPEG}
 
 // if you enable delphi jpegs the libJPEG will be ignored
 {.$DEFINE GLB_DELPHI_JPEG}
diff --git a/uglcShader.pas b/uglcShader.pas
index bebe142..37f84c9 100644
--- a/uglcShader.pas
+++ b/uglcShader.pas
@@ -133,13 +133,14 @@ const
 function TglcShaderObject.GetInfoLog(aObj: GLHandle): String;
 var
   Msg: PChar;
-  bLen, sLen: GLint;
+  bLen: GLint;
+  sLen: GLsizei;
 begin
   bLen := 0;
   glGetShaderiv(aObj, GL_INFO_LOG_LENGTH, @bLen);
   if bLen > 1 then begin
     GetMem(Msg, bLen * SizeOf(Char));
-    glGetShaderInfoLog(aObj, bLen, sLen{%H-}, Msg);
+    glGetShaderInfoLog(aObj, bLen, @sLen, Msg);
     result := PChar(Msg);
     Dispose(Msg);
   end;
@@ -253,13 +254,14 @@ end;
 function TglcShaderProgram.GetInfoLog(Obj: GLHandle): String;
 var
   Msg: PChar;
-  bLen, sLen: GLint;
+  bLen: GLint;
+  sLen: GLsizei;
 begin
   bLen := 0;
   glGetProgramiv(Obj, GL_INFO_LOG_LENGTH, @bLen);
   if bLen > 1 then begin
     GetMem(Msg, bLen * SizeOf(Char));
-    glGetProgramInfoLog(Obj, bLen, sLen{%H-}, Msg);
+    glGetProgramInfoLog(Obj, bLen, @sLen, Msg);
     result := PChar(Msg);
     Dispose(Msg);
   end;