X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fgpu-gles%2FgpuTexture.c;h=c3d88f901ba78b8af5b0c60b25f661d698de62f4;hp=f057951b7f2608beb6929c0e5b02fd2fa3ce00b4;hb=13326d3e8422568b7f5528e7b8878b2f496ea652;hpb=677ea10304049d6f7aae48317fe32cfea060d209 diff --git a/plugins/gpu-gles/gpuTexture.c b/plugins/gpu-gles/gpuTexture.c index f057951b..c3d88f90 100644 --- a/plugins/gpu-gles/gpuTexture.c +++ b/plugins/gpu-gles/gpuTexture.c @@ -67,14 +67,6 @@ #define _IN_TEXTURE -#ifdef _WINDOWS -#include "stdafx.h" - -#include "externals.h" -#include "texture.h" -#include "gpu.h" -#include "prim.h" -#else #include "gpuStdafx.h" #include "gpuDraw.h" @@ -83,7 +75,7 @@ #include "gpuTexture.h" #include "gpuPlugin.h" #include "gpuPrim.h" -#endif + #define CLUTCHK 0x00060000 #define CLUTSHIFT 17 @@ -98,11 +90,7 @@ GLuint gTexFrameName=0; int iTexGarbageCollection=1; unsigned long dwTexPageComp=0; int iVRamSize=0; -#ifdef _WINDOWS -int iClampType=GL_CLAMP; -#else int iClampType=GL_CLAMP_TO_EDGE; -#endif int iFilter = GL_LINEAR; void (*LoadSubTexFn) (int,int,short,short); unsigned long (*PalTexturedColourFn) (unsigned long); @@ -166,10 +154,6 @@ unsigned short (*PTCF[2]) (unsigned short); // texture cache implementation //////////////////////////////////////////////////////////////////////// -#ifdef _WINDOWS -#pragma pack(1) -#endif - // "texture window" cache entry typedef struct textureWndCacheEntryTag @@ -195,9 +179,6 @@ typedef struct textureSubCacheEntryTagS unsigned char Opaque; } textureSubCacheEntryS; -#ifdef _WINDOWS -#pragma pack() -#endif //---------------------------------------------