diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-05-13 18:30:38 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-05-13 18:30:38 +0000 |
| commit | cd516a5fd2b6b2b8cac6c618cf47bad839d73417 (patch) | |
| tree | f43479e01a01364953d70e40b4dbd8a92b63889e /Game/Code/Classes/UTexture.pas | |
| parent | c6db72ff9c26450987ddbafdd5a3b573e17439e2 (diff) | |
| download | usdx-cd516a5fd2b6b2b8cac6c618cf47bad839d73417.tar.gz usdx-cd516a5fd2b6b2b8cac6c618cf47bad839d73417.tar.xz usdx-cd516a5fd2b6b2b8cac6c618cf47bad839d73417.zip | |
cleanup
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1086 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Classes/UTexture.pas')
| -rw-r--r-- | Game/Code/Classes/UTexture.pas | 14 |
1 files 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; |