Browse Source

Merge remote-tracking branch 'glBitmap@DGL/unstable'

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

+ 6
- 6
uglcBitmap.pas View File

@@ -8536,13 +8536,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}

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

inherited UploadData(aDataObj, aCheckSize);

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

inherited UploadData(aDataObj, aCheckSize);
end;

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -8705,12 +8705,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;

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


Loading…
Cancel
Save