Преглед изворни кода

* fixed some errors

master
Bergmann89 пре 11 година
родитељ
комит
83d5fbb406
3 измењених фајлова са 13 додато и 10 уклоњено
  1. +2
    -1
      dglOpenGL.pas
  2. +5
    -5
      uglcBitmap.pas
  3. +6
    -4
      uglcShader.pas

+ 2
- 1
dglOpenGL.pas Прегледај датотеку

@@ -3011,6 +3011,7 @@ const


// GL_ARB_imaging // GL_ARB_imaging
GL_CONSTANT_COLOR_ARB = $8001; GL_CONSTANT_COLOR_ARB = $8001;
GL_CONSTANT_COLOR = $8001;
GL_ONE_MINUS_CONSTANT_COLOR = $8002; GL_ONE_MINUS_CONSTANT_COLOR = $8002;
GL_CONSTANT_ALPHA = $8003; GL_CONSTANT_ALPHA = $8003;
GL_ONE_MINUS_CONSTANT_ALPHA = $8004; GL_ONE_MINUS_CONSTANT_ALPHA = $8004;
@@ -14968,7 +14969,7 @@ end;


function Int_GetExtensionString: AnsiString; function Int_GetExtensionString: AnsiString;
var var
ExtensionCount : GLuint;
ExtensionCount : GLint;
i : Integer; i : Integer;
begin begin
if GL_VERSION_3_0 if GL_VERSION_3_0


+ 5
- 5
uglcBitmap.pas Прегледај датотеку

@@ -217,11 +217,11 @@ History
25-07-2003 25-07-2003
- begin of programming - begin of programming
***********************************************************} ***********************************************************}
unit glBitmap;
unit uglcBitmap;


// Please uncomment the defines below to configure the glBitmap to your preferences. // Please uncomment the defines below to configure the glBitmap to your preferences.
// If you have configured the unit you can uncomment the warning above. // 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 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Preferences ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -242,7 +242,7 @@ unit glBitmap;
{.$DEFINE GLB_DELPHI} {.$DEFINE GLB_DELPHI}


// activate to enable the support for TLazIntfImage from Lazarus // 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 // activate to enable Lazarus TPortableNetworkGraphic support
// if you enable this pngImage and libPNG will be ignored // 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/ // activate to enable png support with the unit pngimage -> http://pngdelphi.sourceforge.net/
// if you enable pngimage the libPNG will be ignored // if you enable pngimage the libPNG will be ignored
@@ -268,7 +268,7 @@ unit glBitmap;


// activate to enable Lazarus TJPEGImage support // activate to enable Lazarus TJPEGImage support
// if you enable this delphi jpegs and libJPEG will be ignored // 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 // if you enable delphi jpegs the libJPEG will be ignored
{.$DEFINE GLB_DELPHI_JPEG} {.$DEFINE GLB_DELPHI_JPEG}


+ 6
- 4
uglcShader.pas Прегледај датотеку

@@ -133,13 +133,14 @@ const
function TglcShaderObject.GetInfoLog(aObj: GLHandle): String; function TglcShaderObject.GetInfoLog(aObj: GLHandle): String;
var var
Msg: PChar; Msg: PChar;
bLen, sLen: GLint;
bLen: GLint;
sLen: GLsizei;
begin begin
bLen := 0; bLen := 0;
glGetShaderiv(aObj, GL_INFO_LOG_LENGTH, @bLen); glGetShaderiv(aObj, GL_INFO_LOG_LENGTH, @bLen);
if bLen > 1 then begin if bLen > 1 then begin
GetMem(Msg, bLen * SizeOf(Char)); GetMem(Msg, bLen * SizeOf(Char));
glGetShaderInfoLog(aObj, bLen, sLen{%H-}, Msg);
glGetShaderInfoLog(aObj, bLen, @sLen, Msg);
result := PChar(Msg); result := PChar(Msg);
Dispose(Msg); Dispose(Msg);
end; end;
@@ -253,13 +254,14 @@ end;
function TglcShaderProgram.GetInfoLog(Obj: GLHandle): String; function TglcShaderProgram.GetInfoLog(Obj: GLHandle): String;
var var
Msg: PChar; Msg: PChar;
bLen, sLen: GLint;
bLen: GLint;
sLen: GLsizei;
begin begin
bLen := 0; bLen := 0;
glGetProgramiv(Obj, GL_INFO_LOG_LENGTH, @bLen); glGetProgramiv(Obj, GL_INFO_LOG_LENGTH, @bLen);
if bLen > 1 then begin if bLen > 1 then begin
GetMem(Msg, bLen * SizeOf(Char)); GetMem(Msg, bLen * SizeOf(Char));
glGetProgramInfoLog(Obj, bLen, sLen{%H-}, Msg);
glGetProgramInfoLog(Obj, bLen, @sLen, Msg);
result := PChar(Msg); result := PChar(Msg);
Dispose(Msg); Dispose(Msg);
end; end;


Loading…
Откажи
Сачувај