From cd516a5fd2b6b2b8cac6c618cf47bad839d73417 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 13 May 2008 18:30:38 +0000
Subject: cleanup
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1086 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
Game/Code/Classes/UTexture.pas | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/Game/Code/Classes/UTexture.pas b/Game/Code/Classes/UTexture.pas
index 148d5514..56b8ac79 100644
--- a/Game/Code/Classes/UTexture.pas
+++ b/Game/Code/Classes/UTexture.pas
@@ -119,8 +119,6 @@ var
Texture: TTextureUnit;
TextureDatabase: TTextureDatabase;
- ActTex: GLuint;
-
Mipmapping: Boolean;
CacheMipmap: array[0..256*256*3-1] of byte; // 3KB
@@ -133,9 +131,6 @@ uses ULog,
DateUtils,
UCovers,
UThemes,
- {$IFDEF DARWIN}
- MacResources,
- {$ENDIF}
StrUtils;
Constructor TTextureUnit.Create;
@@ -350,6 +345,7 @@ var
MipmapSurface: PSDL_Surface;
newWidth, newHeight: Cardinal;
oldWidth, oldHeight: Cardinal;
+ ActTex: GLuint;
begin
Log.BenchmarkStart(4);
Mipmapping := true;
@@ -488,13 +484,6 @@ begin
// and could now create our openGL texture from it
// prepare OpenGL texture
-
- // JB_linux : this is causing AV's on linux... ActText seems to be nil !
-// {$IFnDEF win32}
-// if pointer(ActTex) = nil then
-// exit;
-// {$endif}
-
glGenTextures(1, @ActTex);
glBindTexture(GL_TEXTURE_2D, ActTex);
@@ -760,6 +749,7 @@ var
PPix: PByteArray;
TempA: integer;
Error: integer;
+ ActTex: GLuint;
begin
Mipmapping := false;
--
cgit v1.2.3