|
|
|
@@ -11,7 +11,7 @@ not use this file except in compliance with the License. You may |
|
|
|
obtain a copy of the License at |
|
|
|
http://www.mozilla.org/MPL/MPL-1.1.html |
|
|
|
------------------------------------------------------------ |
|
|
|
Version 3.0.0 unstable |
|
|
|
Version 3.0.1 |
|
|
|
------------------------------------------------------------ |
|
|
|
History |
|
|
|
20-11-2013 |
|
|
|
@@ -5002,7 +5002,7 @@ var |
|
|
|
bfFormat: TbmpBitfieldFormat; |
|
|
|
pSourceLine, pDestLine: PByte; |
|
|
|
pSourceMD, pDestMD: Pointer; |
|
|
|
x, y: Integer; |
|
|
|
x, y: Cardinal; |
|
|
|
pixel: TglBitmapPixelData; |
|
|
|
begin |
|
|
|
bfFormat := TbmpBitfieldFormat.Create; |
|
|
|
@@ -5386,7 +5386,6 @@ var |
|
|
|
TempPtr: PByte; |
|
|
|
Size: Integer; |
|
|
|
begin |
|
|
|
result := nil; |
|
|
|
Temp := (ClassType.Create as TglBitmap); |
|
|
|
try |
|
|
|
// copy texture data if assigned |
|
|
|
@@ -8052,8 +8051,8 @@ end; |
|
|
|
procedure TglBitmap2D.GetDataFromTexture; |
|
|
|
var |
|
|
|
Temp: PByte; |
|
|
|
TempWidth, TempHeight: Integer; |
|
|
|
TempIntFormat: GLint; |
|
|
|
TempWidth, TempHeight: GLint; |
|
|
|
TempIntFormat: GLenum; |
|
|
|
IntFormat, f: TglBitmapFormat; |
|
|
|
FormatDesc: TFormatDescriptor; |
|
|
|
begin |
|
|
|
@@ -8062,7 +8061,7 @@ begin |
|
|
|
// Request Data |
|
|
|
glGetTexLevelParameteriv(Target, 0, GL_TEXTURE_WIDTH, @TempWidth); |
|
|
|
glGetTexLevelParameteriv(Target, 0, GL_TEXTURE_HEIGHT, @TempHeight); |
|
|
|
glGetTexLevelParameteriv(Target, 0, GL_TEXTURE_INTERNAL_FORMAT, @TempIntFormat); |
|
|
|
glGetTexLevelParameteriv(Target, 0, GL_TEXTURE_INTERNAL_FORMAT, PGLint(@TempIntFormat)); |
|
|
|
|
|
|
|
IntFormat := tfEmpty; |
|
|
|
for f := Low(TglBitmapFormat) to High(TglBitmapFormat) do begin |
|
|
|
|