Browse Source

* fixed bug: upload of compressed textures will fail

master
Bergmann89 9 years ago
parent
commit
ee225899fa
1 changed files with 6 additions and 6 deletions
  1. +6
    -6
      glBitmap.pas

+ 6
- 6
glBitmap.pas View File

@@ -8524,13 +8524,13 @@ begin
raise EglBitmapNonPowerOfTwo.Create('TglBitmap1D.GenTexture - Rendercontex dosn''t support non power of two texture.'); raise EglBitmapNonPowerOfTwo.Create('TglBitmap1D.GenTexture - Rendercontex dosn''t support non power of two texture.');
end; end;


inherited UploadData(aDataObj, aCheckSize);

if (fID = 0) then if (fID = 0) then
CreateID; CreateID;
SetupParameters(BuildWithGlu); SetupParameters(BuildWithGlu);
UploadDataIntern(aDataObj, BuildWithGlu); UploadDataIntern(aDataObj, BuildWithGlu);
glAreTexturesResident(1, @fID, @fIsResident); glAreTexturesResident(1, @fID, @fIsResident);

inherited UploadData(aDataObj, aCheckSize);
end; end;
{$ENDIF} {$ENDIF}


@@ -8600,6 +8600,8 @@ begin
{$IFEND} {$IFEND}
end; end;


inherited UploadData(aDataObj, aCheckSize);

if (fID = 0) then if (fID = 0) then
CreateID; CreateID;
SetupParameters({$IFNDEF OPENGL_ES}BuildWithGlu{$ENDIF}); SetupParameters({$IFNDEF OPENGL_ES}BuildWithGlu{$ENDIF});
@@ -8607,8 +8609,6 @@ begin
{$IFNDEF OPENGL_ES} {$IFNDEF OPENGL_ES}
glAreTexturesResident(1, @fID, @fIsResident); glAreTexturesResident(1, @fID, @fIsResident);
{$ENDIF} {$ENDIF}

inherited UploadData(aDataObj, aCheckSize);
end; end;


////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -8693,12 +8693,12 @@ begin
{$IFEND} {$IFEND}
end; end;


inherited UploadData(aDataObj, aCheckSize);

if (fID = 0) then if (fID = 0) then
CreateID; CreateID;
SetupParameters({$IFNDEF OPENGL_ES}BuildWithGlu{$ENDIF}); SetupParameters({$IFNDEF OPENGL_ES}BuildWithGlu{$ENDIF});
UploadDataIntern(aDataObj, aCubeTarget{$IFNDEF OPENGL_ES}, BuildWithGlu{$ENDIF}); UploadDataIntern(aDataObj, aCubeTarget{$IFNDEF OPENGL_ES}, BuildWithGlu{$ENDIF});

inherited UploadData(aDataObj, aCheckSize);
end; end;


////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////


Loading…
Cancel
Save