Commit ee225899 authored by Bergmann89's avatar Bergmann89

* fixed bug: upload of compressed textures will fail

parent a5e66896
......@@ -8524,13 +8524,13 @@ begin
raise EglBitmapNonPowerOfTwo.Create('TglBitmap1D.GenTexture - Rendercontex dosn''t support non power of two texture.');
end;
inherited UploadData(aDataObj, aCheckSize);
if (fID = 0) then
CreateID;
SetupParameters(BuildWithGlu);
UploadDataIntern(aDataObj, BuildWithGlu);
glAreTexturesResident(1, @fID, @fIsResident);
inherited UploadData(aDataObj, aCheckSize);
end;
{$ENDIF}
......@@ -8600,6 +8600,8 @@ begin
{$IFEND}
end;
inherited UploadData(aDataObj, aCheckSize);
if (fID = 0) then
CreateID;
SetupParameters({$IFNDEF OPENGL_ES}BuildWithGlu{$ENDIF});
......@@ -8607,8 +8609,6 @@ begin
{$IFNDEF OPENGL_ES}
glAreTexturesResident(1, @fID, @fIsResident);
{$ENDIF}
inherited UploadData(aDataObj, aCheckSize);
end;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......@@ -8693,12 +8693,12 @@ begin
{$IFEND}
end;
inherited UploadData(aDataObj, aCheckSize);
if (fID = 0) then
CreateID;
SetupParameters({$IFNDEF OPENGL_ES}BuildWithGlu{$ENDIF});
UploadDataIntern(aDataObj, aCubeTarget{$IFNDEF OPENGL_ES}, BuildWithGlu{$ENDIF});
inherited UploadData(aDataObj, aCheckSize);
end;
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment