X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Frenders%2Fopengl%2Fr_textures.pas;h=56d2656c8c17e0e556e70e8525fc06e7e718537e;hb=d0374fd617aa1703e4aa31b8ff3b0f5228636021;hp=24ea1642e7aa37ec447a509ed4ce2c02627f7bbf;hpb=6dd60afe238e2d7e403568cc286e8f1152b138a0;p=d2df-sdl.git

diff --git a/src/game/renders/opengl/r_textures.pas b/src/game/renders/opengl/r_textures.pas
index 24ea164..56d2656 100644
--- a/src/game/renders/opengl/r_textures.pas
+++ b/src/game/renders/opengl/r_textures.pas
@@ -18,17 +18,16 @@ unit r_textures;
 interface
 
   uses
-    {$IFDEF USE_GLES1}
-      GLES11,
-    {$ELSE}
-      GL, GLEXT,
-    {$ENDIF}
+    {$I ../../../nogl/noGLuses.inc}
     g_base, g_animations,  // TRectHW, TAnimInfo
     utils,
     r_atlas, r_fonts
   ;
 
   type
+    TGLHints = (txNoRepeat);
+    TGLHintsSet = set of TGLHints;
+
     TGLAtlas = class;
 
     TGLAtlasNode = class (TAtlasNode)
@@ -65,6 +64,7 @@ interface
         mHeight: Integer;
         mCols: Integer;
         mTile: array of TGLAtlasNode;
+        mHints: TGLHintsSet;
 
       public
         destructor Destroy; override;
@@ -77,6 +77,7 @@ interface
         property height: Integer read mHeight;
         property cols: Integer read mCols;
         property lines: Integer read GetLines;
+        property hints: TGLHintsSet read mHints;
     end;
 
     TGLMultiTexture = class
@@ -125,15 +126,17 @@ interface
   procedure r_Textures_Initialize;
   procedure r_Textures_Finalize;
 
-  function r_Textures_LoadFromFile (const filename: AnsiString; log: Boolean = True): TGLTexture;
-  function r_Textures_LoadMultiFromFile (const filename: AnsiString; log: Boolean = True): TGLMultiTexture;
-  function r_Textures_LoadMultiFromFileAndInfo (const filename: AnsiString; w, h, count: Integer; log: Boolean = True): TGLMultiTexture;
-  function r_Textures_LoadMultiTextFromFile (const filename: AnsiString; var txt: TAnimTextInfo; log: Boolean = True): TGLMultiTexture;
+  function r_Textures_LoadFromFile (const filename: AnsiString; hints: TGLHintsSet; log: Boolean = True): TGLTexture;
+  function r_Textures_LoadMultiFromFile (const filename: AnsiString; hints: TGLHintsSet; log: Boolean = True): TGLMultiTexture;
+  function r_Textures_LoadMultiFromFileAndInfo (const filename: AnsiString; w, h, count: Integer; hints: TGLHintsSet; log: Boolean = True): TGLMultiTexture;
+  function r_Textures_LoadMultiTextFromFile (const filename: AnsiString; var txt: TAnimTextInfo; hints: TGLHintsSet; log: Boolean = True): TGLMultiTexture;
 
-  function r_Textures_LoadStreamFromFile (const filename: AnsiString; w, h, count, cw: Integer; st: TGLTextureArray; rs: TRectArray; log: Boolean = True): Boolean;
+  function r_Textures_LoadStreamFromFile (const filename: AnsiString; w, h, count, cw: Integer; st: TGLTextureArray; rs: TRectArray; hints: TGLHintsSet; log: Boolean = True): Boolean;
 
   function r_Textures_LoadFontFromFile (const filename: AnsiString; constref f: TFontInfo; font2enc: TConvProc; log: Boolean = true): TGLFont;
 
+  procedure r_Textures_GL_Bind (id: GLuint);
+
 implementation
 
   uses
@@ -146,8 +149,19 @@ implementation
 
   var
     r_GL_MaxTexSize: WORD;
+    r_GL_RepeatOpt: Boolean;
     maxTileSize: Integer;
-    atl: array of TGLAtlas;
+    atl, ratl: array of TGLAtlas;
+    currentTexture2D: GLuint;
+
+  procedure r_Textures_GL_Bind (id: GLuint);
+  begin
+    if id <> currentTexture2D then
+    begin
+      glBindTexture(GL_TEXTURE_2D, id);
+      currentTexture2D := id;
+    end
+  end;
 
   (* --------- TGLAtlasNode --------- *)
 
@@ -179,9 +193,9 @@ implementation
     ASSERT(n.l + x + w - 1 <= n.r);
     ASSERT(n.t + y + h - 1 <= n.b);
     ASSERT(n.id > 0);
-    glBindTexture(GL_TEXTURE_2D, n.id);
+    r_Textures_GL_Bind(n.id);
     glTexSubImage2D(GL_TEXTURE_2D, 0, n.l + x, n.t + y, w, h, GL_RGBA, GL_UNSIGNED_BYTE, data);
-    glBindTexture(GL_TEXTURE_2D, 0);
+    r_Textures_GL_Bind(0);
   end;
 
   (* --------- TGLAtlas --------- *)
@@ -215,11 +229,13 @@ implementation
     glGenTextures(1, @id);
     if id <> 0 then
     begin
-      glBindTexture(GL_TEXTURE_2D, id);
+      r_Textures_GL_Bind(id);
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, nil);
-      glBindTexture(GL_TEXTURE_2D, 0);
+      r_Textures_GL_Bind(0);
     end;
     result := id
   end;
@@ -238,6 +254,20 @@ implementation
     end;
   end;
 
+  function r_Textures_AllocRepeatAtlas (w, h: Integer): TGLAtlas;
+    var i: Integer; id: GLuint;
+  begin
+    result := nil;
+    id := r_Textures_AllocHWTexture(w, h);
+    if id <> 0 then
+    begin
+      i := Length(ratl);
+      SetLength(ratl, i + 1);
+      ratl[i] := TGLAtlas.Create(w, h, id);
+      result := ratl[i];
+    end;
+  end;
+
   function r_Textures_AllocNode (w, h: Integer): TGLAtlasNode;
     var i: Integer; n: TGLAtlasNode; a: TGLAtlas;
   begin
@@ -260,22 +290,56 @@ implementation
     result := n
   end;
 
+  function r_Textures_AllocRepeatNode (w, h: Integer): TGLAtlasNode;
+    var i: Integer; n: TGLAtlasNode; a: TGLAtlas;
+  begin
+    n := nil; a := nil;
+    if ratl <> nil then
+    begin
+      i := High(ratl);
+      while (i >= 0) and (ratl[i] <> nil) do DEC(i);
+      if i >= 0 then a := ratl[i];
+    end;
+    if a = nil then a := r_Textures_AllocRepeatAtlas(w, h);
+    if a <> nil then
+    begin
+      n := a.Alloc(w, h);
+      if n = nil then
+      begin
+        i := High(ratl); while (i >= 0) and (ratl[i] <> a) do DEC(i);
+        if i >= 0 then ratl[i] := nil;
+        r_Common_FreeAndNil(a);
+      end;
+    end;
+    result := n
+  end;
+
   (* --------- TGLTexture --------- *)
 
   destructor TGLTexture.Destroy;
-    var i: Integer;
+    var i: Integer; a: TGLAtlas;
   begin
     if self.mTile <> nil then
     begin
-      for i := 0 to High(self.mTile) do
+      if TGLHints.txNoRepeat in self.hints then (* non repeatable texture -> delete tiles only *)
       begin
-        if self.mTile[i] <> nil then
+        for i := 0 to High(self.mTile) do
         begin
-          self.mTile[i].Dealloc;
-          self.mTile[i] := nil;
-        end;
+          if self.mTile[i] <> nil then
+          begin
+            self.mTile[i].Dealloc;
+            self.mTile[i] := nil
+          end
+        end
+      end
+      else (* repeatable texture -> delete whole atlas *)
+      begin
+        a := self.mTile[0].base;
+        i := High(ratl); while (i >= 0) and (ratl[i] <> a) do DEC(i);
+        if i >= 0 then ratl[i] := nil;
+        r_Common_FreeAndNil(a);
       end;
-      self.mTile := nil;
+      SetLength(self.mTile, 0);
     end;
     inherited;
   end;
@@ -299,29 +363,44 @@ implementation
     ASSERT(result <> nil)
   end;
 
-  function r_Textures_Alloc (w, h: Integer): TGLTexture;
+  function r_Textures_Alloc (w, h: Integer; hints: TGLHintsSet): TGLTexture;
     var x, y, mw, mh, cols, lines: Integer; t: TGLTexture;
   begin
     ASSERT(w > 0);
     ASSERT(h > 0);
-    cols := (w + maxTileSize - 1) div maxTileSize;
-    lines := (h + maxTileSize - 1) div maxTileSize;
-    t := TGLTexture.Create;
-    t.mWidth := w;
-    t.mHeight := h;
-    t.mCols := cols;
-    // t.mLines := lines;
-    SetLength(t.mTile, cols * lines);
-    for y := 0 to lines - 1 do
-    begin
-      mh := Min(maxTileSize, h - y * maxTileSize);
-      ASSERT(mh > 0);
-      for x := 0 to cols - 1 do
+    if TGLHints.txNoRepeat in hints then
+    begin
+      cols := (w + maxTileSize - 1) div maxTileSize;
+      lines := (h + maxTileSize - 1) div maxTileSize;
+      t := TGLTexture.Create;
+      t.mWidth := w;
+      t.mHeight := h;
+      t.mCols := cols;
+      // t.mLines := lines;
+      t.mHints := hints;
+      SetLength(t.mTile, cols * lines);
+      for y := 0 to lines - 1 do
       begin
-        mw := Min(maxTileSize, w - x * maxTileSize);
-        ASSERT(mw > 0);
-        t.mTile[y * cols + x] := r_Textures_AllocNode(mw, mh);
-      end
+        mh := Min(maxTileSize, h - y * maxTileSize);
+        ASSERT(mh > 0);
+        for x := 0 to cols - 1 do
+        begin
+          mw := Min(maxTileSize, w - x * maxTileSize);
+          ASSERT(mw > 0);
+          t.mTile[y * cols + x] := r_Textures_AllocNode(mw, mh);
+        end
+      end;
+    end
+    else
+    begin
+      t := TGLTexture.Create;
+      t.mWidth := w;
+      t.mHeight := h;
+      t.mCols := 1;
+      // t.mLines := 1
+      t.mHints := hints;
+      SetLength(t.mTile, 1);
+      t.mTile[0] := r_Textures_AllocRepeatNode(w, h);
     end;
     result := t;
   end;
@@ -386,7 +465,8 @@ implementation
     begin
       // auto, max possible reccomended by driver
       glGetIntegerv(GL_MAX_TEXTURE_SIZE, @size);
-      if size < 1 then size := 64;
+      size := size div 2; (* hack: on some devices max size may produce invalid texture *)
+      if size < 64 then size := 64; (* at least 64x64 are guarantied by specification *)
     end
     else
     begin
@@ -401,8 +481,9 @@ implementation
 
   procedure r_Textures_Initialize;
   begin
+    currentTexture2D := 0;
     maxTileSize := r_Textures_GetMaxHardwareSize();
-    e_LogWritefln('TEXTURE SIZE: %s', [maxTileSize]);
+    e_LogWritefln('Texture Tile Size: %s', [maxTileSize]);
   end;
 
   procedure r_Textures_Finalize;
@@ -412,12 +493,29 @@ implementation
     begin
       for i := 0 to High(atl) do
       begin
-        glDeleteTextures(1, @atl[i].id);
-        atl[i].id := 0;
-        r_Common_FreeAndNil(atl[i]);
+        if atl[i] <> nil then
+        begin
+          glDeleteTextures(1, @atl[i].id);
+          atl[i].id := 0;
+          r_Common_FreeAndNil(atl[i]);
+        end;
       end;
     end;
     SetLength(atl, 0);
+
+    if ratl <> nil then
+    begin
+      for i := 0 to High(ratl) do
+      begin
+        if ratl[i] <> nil then
+        begin
+          glDeleteTextures(1, @ratl[i].id);
+          ratl[i].id := 0;
+          r_Common_FreeAndNil(ratl[i]);
+        end;
+      end;
+    end;
+    SetLength(ratl, 0);
   end;
 
   function r_Textures_FixImageData (var img: TImageData): Boolean;
@@ -428,13 +526,34 @@ implementation
         result := true;
   end;
 
-  function r_Textures_LoadFromImage (var img: TImageData): TGLTexture;
+  function r_Textures_ValidRepeatTexture (w, h: Integer; hints: TGLHintsSet): Boolean;
+  begin
+    result := r_GL_RepeatOpt and
+              not (TGLHints.txNoRepeat in hints) and
+              (w <= maxTileSize) and
+              (h <= maxTileSize) and
+              IsPOT(w) and
+              IsPOT(h)
+  end;
+
+  function r_Textures_LoadFromImage (var img: TImageData; hints: TGLHintsSet): TGLTexture; // !!!
     var t: TGLTexture; n: TGLAtlasNode; c: TDynImageDataArray; cw, ch, i, j: LongInt;
   begin
     result := nil;
-    if SplitImage(img, c, maxTileSize, maxTileSize, cw, ch, False) then
+    if r_Textures_ValidRepeatTexture(img.width, img.height, hints) then
     begin
-      t := r_Textures_Alloc(img.width, img.height);
+      t := r_Textures_Alloc(img.width, img.height, hints - [TGLHints.txNoRepeat]);
+      if t <> nil then
+      begin
+        n := t.GetTile(0, 0);
+        ASSERT(n <> nil);
+        r_Textures_UpdateNode(n, img.bits, 0, 0, n.width, n.height);
+        result := t
+      end
+    end
+    else if SplitImage(img, c, maxTileSize, maxTileSize, cw, ch, False) then
+    begin
+      t := r_Textures_Alloc(img.width, img.height, hints + [TGLHints.txNoRepeat]);
       if t <> nil then
       begin
         ASSERT(cw = t.cols);
@@ -454,7 +573,7 @@ implementation
     end;
   end;
 
-  function r_Textures_LoadFromMemory (data: Pointer; size: LongInt): TGLTexture;
+  function r_Textures_LoadFromMemory (data: Pointer; size: LongInt; hints: TGLHintsSet): TGLTexture;
     var img: TImageData;
   begin
     result := nil;
@@ -464,14 +583,14 @@ implementation
       try
         if LoadImageFromMemory(data, size, img) then
           if r_Textures_FixImageData(img) then
-            result := r_Textures_LoadFromImage(img)
+            result := r_Textures_LoadFromImage(img, hints)
       except
       end;
       FreeImage(img);
     end;
   end;
 
-  function r_Textures_LoadFromFile (const filename: AnsiString; log: Boolean = True): TGLTexture;
+  function r_Textures_LoadFromFile (const filename: AnsiString; hints: TGLHintsSet; log: Boolean = True): TGLTexture;
     var wad: TWADFile; wadName, resName: AnsiString; data: Pointer; size: Integer;
   begin
     result := nil;
@@ -482,14 +601,14 @@ implementation
       resName := g_ExtractFilePathName(filename);
       if wad.GetResource(resName, data, size, log) then
       begin
-        result := r_Textures_LoadFromMemory(data, size);
+        result := r_Textures_LoadFromMemory(data, size, hints);
         FreeMem(data);
       end;
       wad.Free
     end
   end;
 
-  function r_Textures_LoadMultiFromImageAndInfo (var img: TImageData; w, h, c: Integer): TGLMultiTexture;
+  function r_Textures_LoadMultiFromImageAndInfo (var img: TImageData; w, h, c: Integer; hints: TGLHintsSet): TGLMultiTexture;
     var t: TImageData; a: array of TGLTexture; i: Integer; m: TGLMultiTexture;
   begin
     ASSERT(w >= 0);
@@ -502,7 +621,7 @@ implementation
       InitImage(t);
       if NewImage(w, h, img.Format, t) then
         if CopyRect(img, w * i, 0, w, h, t, 0, 0) then
-          a[i] := r_Textures_LoadFromImage(t);
+          a[i] := r_Textures_LoadFromImage(t, hints);
       ASSERT(a[i] <> nil);
       FreeImage(t);
     end;
@@ -512,7 +631,7 @@ implementation
     result := m;
   end;
 
-  function r_Textures_LoadMultiFromDataAndInfo (data: Pointer; size: LongInt; w, h, c: Integer): TGLMultiTexture;
+  function r_Textures_LoadMultiFromDataAndInfo (data: Pointer; size: LongInt; w, h, c: Integer; hints: TGLHintsSet): TGLMultiTexture;
     var img: TImageData;
   begin
     ASSERT(w > 0);
@@ -525,14 +644,14 @@ implementation
       try
         if LoadImageFromMemory(data, size, img) then
           if r_Textures_FixImageData(img) then
-            result := r_Textures_LoadMultiFromImageAndInfo(img, w, h, c)
+            result := r_Textures_LoadMultiFromImageAndInfo(img, w, h, c, hints)
       except
       end;
       FreeImage(img);
     end;
   end;
 
-  function r_Textures_LoadTextFromMemory (data: Pointer; size: LongInt; var txt: TAnimTextInfo): Boolean;
+  function r_Textures_LoadTextFromMemory (data: Pointer; size: LongInt; var text: TAnimTextInfo): Boolean;
     var cfg: TConfig;
   begin
     result := false;
@@ -541,20 +660,28 @@ implementation
       cfg := TConfig.CreateMem(data, size);
       if cfg <> nil then
       begin
-        txt.name := cfg.ReadStr('', 'resource', '');
-        txt.w := MAX(0, cfg.ReadInt('', 'framewidth', 0));
-        txt.h := MAX(0, cfg.ReadInt('', 'frameheight', 0));
-        txt.anim.loop := true;
-        txt.anim.delay := MAX(0, cfg.ReadInt('', 'waitcount', 0));
-        txt.anim.frames := MAX(0, cfg.ReadInt('', 'framecount', 0));
-        txt.anim.back := cfg.ReadBool('', 'backanim', false);
+        text.name := cfg.ReadStr('', 'resource', '');
+        text.w := cfg.ReadInt('', 'framewidth', 0);
+        text.h := cfg.ReadInt('', 'frameheight', 0);
+        text.anim.loop := true;
+        text.anim.delay := cfg.ReadInt('', 'waitcount', 0);
+        text.anim.frames := cfg.ReadInt('', 'framecount', 0);
+        text.anim.back := cfg.ReadBool('', 'backanim', false);
+        if text.w <= 0 then e_LogWritefln('Warning: bad animation width %s for %s', [text.w, text.name]);
+        if text.h <= 0 then e_LogWritefln('Warning: bad animation height %s for %s', [text.h, text.name]);
+        if text.anim.delay <= 0 then e_LogWritefln('Warning: bad animation delay %s for %s', [text.anim.delay, text.name]);
+        if text.anim.frames <= 0 then e_LogWritefln('Warning: bad animation frame count %s for %s', [text.anim.frames, text.name]);
+        text.w := MAX(0, text.w);
+        text.h := MAX(0, text.h);
+        text.anim.delay := MAX(1, text.anim.delay);
+        text.anim.frames := MAX(1, text.anim.frames);
         cfg.Free;
-        result := (txt.name <> '') and (txt.w > 0) and (txt.h > 0) and (txt.anim.delay > 0) and (txt.anim.frames > 0);
+        result := (text.name <> '') and (text.w > 0) and (text.h > 0) and (text.anim.delay > 0) and (text.anim.frames > 0);
       end;
     end;
   end;
 
-  function r_Textures_LoadMultiFromWad (wad: TWADFile; var txt: TAnimTextInfo): TGLMultiTexture;
+  function r_Textures_LoadMultiFromWad (wad: TWADFile; var txt: TAnimTextInfo; hints: TGLHintsSet): TGLMultiTexture;
     var data: Pointer; size: LongInt; img: TImageData;
   begin
     ASSERT(wad <> nil);
@@ -570,7 +697,7 @@ implementation
           try
             if LoadImageFromMemory(data, size, img) then
               if r_Textures_FixImageData(img) then
-                result := r_Textures_LoadMultiFromImageAndInfo(img, txt.w, txt.h, txt.anim.frames);
+                result := r_Textures_LoadMultiFromImageAndInfo(img, txt.w, txt.h, txt.anim.frames, hints);
           finally
             FreeMem(data);
           end;
@@ -582,13 +709,13 @@ implementation
     end;
   end;
 
-  function r_Textures_LoadMultiFromMemory (data: Pointer; size: LongInt; var txt: TAnimTextInfo): TGLMultiTexture;
+  function r_Textures_LoadMultiFromMemory (data: Pointer; size: LongInt; var txt: TAnimTextInfo; hints: TGLHintsSet): TGLMultiTexture;
     var wad: TWADFile; t: TGLTexture; m: TGLMultiTexture;
   begin
     result := nil;
     if (data <> nil) and (size > 0) then
     begin
-      t := r_Textures_LoadFromMemory(data, size);
+      t := r_Textures_LoadFromMemory(data, size, hints);
       if t <> nil then
       begin
         m := TGLMultiTexture.Create();
@@ -608,14 +735,14 @@ implementation
         wad := TWADFile.Create();
         if wad.ReadMemory(data, size) then
         begin
-          result := r_Textures_LoadMultiFromWad(wad, txt);
+          result := r_Textures_LoadMultiFromWad(wad, txt, hints);
           wad.Free;
         end
       end
     end
   end;
 
-  function r_Textures_LoadMultiTextFromFile (const filename: AnsiString; var txt: TAnimTextInfo; log: Boolean = True): TGLMultiTexture;
+  function r_Textures_LoadMultiTextFromFile (const filename: AnsiString; var txt: TAnimTextInfo; hints: TGLHintsSet; log: Boolean = True): TGLMultiTexture;
     var wad: TWADFile; wadName, resName: AnsiString; data: Pointer; size: Integer;
   begin
     result := nil;
@@ -626,20 +753,20 @@ implementation
       resName := g_ExtractFilePathName(filename);
       if wad.GetResource(resName, data, size, log) then
       begin
-        result := r_Textures_LoadMultiFromMemory(data, size, txt);
+        result := r_Textures_LoadMultiFromMemory(data, size, txt, hints);
         FreeMem(data);
       end;
       wad.Free
     end
   end;
 
-  function r_Textures_LoadMultiFromFile (const filename: AnsiString; log: Boolean = True): TGLMultiTexture;
+  function r_Textures_LoadMultiFromFile (const filename: AnsiString; hints: TGLHintsSet; log: Boolean = True): TGLMultiTexture;
     var txt: TAnimTextInfo;
   begin
-    result := r_Textures_LoadMultiTextFromFile(filename, txt, log);
+    result := r_Textures_LoadMultiTextFromFile(filename, txt, hints, log);
   end;
 
-  function r_Textures_LoadMultiFromFileAndInfo (const filename: AnsiString; w, h, count: Integer; log: Boolean = True): TGLMultiTexture;
+  function r_Textures_LoadMultiFromFileAndInfo (const filename: AnsiString; w, h, count: Integer; hints: TGLHintsSet; log: Boolean = True): TGLMultiTexture;
     var wad: TWADFile; wadName, resName: AnsiString; data: Pointer; size: Integer;
   begin
     ASSERT(w > 0);
@@ -653,7 +780,7 @@ implementation
       resName := g_ExtractFilePathName(filename);
       if wad.GetResource(resName, data, size, log) then
       begin
-        result := r_Textures_LoadMultiFromDataAndInfo(data, size, w, h, count);
+        result := r_Textures_LoadMultiFromDataAndInfo(data, size, w, h, count, hints);
         FreeMem(data);
       end;
       wad.Free
@@ -717,7 +844,7 @@ implementation
     end;
   end;
 
-  function r_Textures_LoadStreamFromImage (var img: TImageData; w, h, c, cw: Integer; st: TGLTextureArray; rs: TRectArray): Boolean;
+  function r_Textures_LoadStreamFromImage (var img: TImageData; w, h, c, cw: Integer; st: TGLTextureArray; rs: TRectArray; hints: TGLHintsSet): Boolean;
     var i, x, y: Integer; t: TImageData;
   begin
     ASSERT(w >= 0);
@@ -739,7 +866,7 @@ implementation
         begin
           if rs <> nil then
             rs[i] := r_Textures_GetRect(t);
-          st[i] := r_Textures_LoadFromImage(t);
+          st[i] := r_Textures_LoadFromImage(t, hints);
         end;
       end;
       ASSERT(st[i] <> nil);
@@ -747,7 +874,7 @@ implementation
     end;
   end;
 
-  function r_Textures_LoadStreamFromMemory (data: Pointer; size: LongInt; w, h, c, cw: Integer; st: TGLTextureArray; rs: TRectArray): Boolean;
+  function r_Textures_LoadStreamFromMemory (data: Pointer; size: LongInt; w, h, c, cw: Integer; st: TGLTextureArray; rs: TRectArray; hints: TGLHintsSet): Boolean;
     var img: TImageData;
   begin
     ASSERT(w >= 0);
@@ -765,7 +892,7 @@ implementation
         begin
           if r_Textures_FixImageData(img) then
           begin
-            result := r_Textures_LoadStreamFromImage(img, w, h, c, cw, st, rs)
+            result := r_Textures_LoadStreamFromImage(img, w, h, c, cw, st, rs, hints)
           end;
         end;
       except
@@ -774,7 +901,7 @@ implementation
     end;
   end;
 
-  function r_Textures_LoadStreamFromFile (const filename: AnsiString; w, h, count, cw: Integer; st: TGLTextureArray; rs: TRectArray; log: Boolean = True): Boolean;
+  function r_Textures_LoadStreamFromFile (const filename: AnsiString; w, h, count, cw: Integer; st: TGLTextureArray; rs: TRectArray; hints: TGLHintsSet; log: Boolean = True): Boolean;
     var wad: TWADFile; wadName, resName: AnsiString; data: Pointer; size: Integer;
   begin
     ASSERT(w > 0);
@@ -791,7 +918,7 @@ implementation
       resName := g_ExtractFilePathName(filename);
       if wad.GetResource(resName, data, size, log) then
       begin
-        result := r_Textures_LoadStreamFromMemory(data, size, w, h, count, cw, st, rs);
+        result := r_Textures_LoadStreamFromMemory(data, size, w, h, count, cw, st, rs, hints);
         FreeMem(data);
       end;
       wad.Free
@@ -805,7 +932,7 @@ implementation
   begin
     result := nil;
     SetLength(st, 256);
-    if r_Textures_LoadStreamFromFile(filename, f.w, f.h, 256, 16, st, nil, log) then
+    if r_Textures_LoadStreamFromFile(filename, f.w, f.h, 256, 16, st, nil, [TGLHints.txNoRepeat], log) then
     begin
       font := TGLFont.Create();
       font.info := f;
@@ -868,5 +995,7 @@ implementation
 
 initialization
   conRegVar('r_gl_maxtexsize', @r_GL_MaxTexSize, '', '');
+  conRegVar('r_gl_repeat', @r_GL_RepeatOpt, '', '');
   r_GL_MaxTexSize := 0; // default is automatic value
+  r_GL_RepeatOpt := true;
 end.