X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_textures.c;h=b509307f92ad25feafb29f6b6fd0446b9df89725;hb=e6a20dbedf9ea11158142bc2c8c16dfa721d8870;hp=2dd11ebf52f6d9ade26f4491a018dd0c8ba9dac5;hpb=a38c129ff5ec67a0fabc260b59d12922ebb497d8;p=xonotic%2Fdarkplaces.git

diff --git a/gl_textures.c b/gl_textures.c
index 2dd11ebf..b509307f 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -81,6 +81,11 @@ typedef struct textypeinfo_s
 textypeinfo_t;
 
 #ifdef USE_GLES2
+
+// we use these internally even if we never deliver such data to the driver
+#define GL_BGR					0x80E0
+#define GL_BGRA					0x80E1
+
 // framebuffer texture formats
 // GLES2 devices rarely support depth textures, so we actually use a renderbuffer there
 static textypeinfo_t textype_shadowmap16_comp            = {"shadowmap16_comp",         TEXTYPE_SHADOWMAP16_COMP     ,  2,  2,  2.0f, GL_DEPTH_COMPONENT16              , GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT};
@@ -102,6 +107,9 @@ static textypeinfo_t textype_rgba                        = {"rgba",
 static textypeinfo_t textype_rgba_alpha                  = {"rgba_alpha",               TEXTYPE_RGBA          ,  4,  4,  4.0f, GL_RGBA                               , GL_RGBA           , GL_UNSIGNED_BYTE };
 static textypeinfo_t textype_bgra                        = {"bgra",                     TEXTYPE_BGRA          ,  4,  4,  4.0f, GL_RGBA                               , GL_BGRA           , GL_UNSIGNED_BYTE };
 static textypeinfo_t textype_bgra_alpha                  = {"bgra_alpha",               TEXTYPE_BGRA          ,  4,  4,  4.0f, GL_RGBA                               , GL_BGRA           , GL_UNSIGNED_BYTE };
+#ifdef __ANDROID__
+static textypeinfo_t textype_etc1                        = {"etc1",                     TEXTYPE_ETC1          ,  1,  3,  0.5f, GL_ETC1_RGB8_OES                         , 0                 , 0                };
+#endif
 #else
 // framebuffer texture formats
 static textypeinfo_t textype_shadowmap16_comp            = {"shadowmap16_comp",         TEXTYPE_SHADOWMAP16_COMP     ,  2,  2,  2.0f, GL_DEPTH_COMPONENT16_ARB          , GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT};
@@ -157,7 +165,9 @@ typedef enum gltexturetype_e
 gltexturetype_t;
 
 static int gltexturetypeenums[GLTEXTURETYPE_TOTAL] = {GL_TEXTURE_2D, GL_TEXTURE_3D, GL_TEXTURE_CUBE_MAP};
+#ifdef GL_TEXTURE_WRAP_R
 static int gltexturetypedimensions[GLTEXTURETYPE_TOTAL] = {2, 3, 2};
+#endif
 static int cubemapside[6] =
 {
 	GL_TEXTURE_CUBE_MAP_POSITIVE_X,
@@ -268,6 +278,25 @@ static textypeinfo_t *R_GetTexTypeInfo(textype_t textype, int flags)
 {
 	switch(textype)
 	{
+#ifdef USE_GLES2
+	case TEXTYPE_PALETTE: return (flags & TEXF_ALPHA) ? &textype_palette_alpha : &textype_palette;
+	case TEXTYPE_RGBA: return ((flags & TEXF_ALPHA) ? &textype_rgba_alpha : &textype_rgba);
+	case TEXTYPE_BGRA: return ((flags & TEXF_ALPHA) ? &textype_bgra_alpha : &textype_bgra);
+#ifdef __ANDROID__
+	case TEXTYPE_ETC1: return &textype_etc1;
+#endif
+	case TEXTYPE_ALPHA: return &textype_alpha;
+	case TEXTYPE_COLORBUFFER: return &textype_colorbuffer;
+	case TEXTYPE_COLORBUFFER16F: return &textype_colorbuffer16f;
+	case TEXTYPE_COLORBUFFER32F: return &textype_colorbuffer32f;
+	case TEXTYPE_DEPTHBUFFER16: return &textype_depth16;
+	case TEXTYPE_DEPTHBUFFER24: return &textype_depth24;
+	case TEXTYPE_DEPTHBUFFER24STENCIL8: return &textype_depth24stencil8;
+	case TEXTYPE_SHADOWMAP16_COMP: return &textype_shadowmap16_comp;
+	case TEXTYPE_SHADOWMAP16_RAW: return &textype_shadowmap16_raw;
+	case TEXTYPE_SHADOWMAP24_COMP: return &textype_shadowmap24_comp;
+	case TEXTYPE_SHADOWMAP24_RAW: return &textype_shadowmap24_raw;
+#else
 	case TEXTYPE_DXT1: return &textype_dxt1;
 	case TEXTYPE_DXT1A: return &textype_dxt1a;
 	case TEXTYPE_DXT3: return &textype_dxt3;
@@ -293,6 +322,7 @@ static textypeinfo_t *R_GetTexTypeInfo(textype_t textype, int flags)
 	case TEXTYPE_SRGB_PALETTE: return (flags & TEXF_ALPHA) ? &textype_sRGB_palette_alpha : &textype_sRGB_palette;
 	case TEXTYPE_SRGB_RGBA: return ((flags & TEXF_COMPRESS) && vid.support.ext_texture_compression_s3tc) ? ((flags & TEXF_ALPHA) ? &textype_sRGB_rgba_alpha_compress : &textype_sRGB_rgba_compress) : ((flags & TEXF_ALPHA) ? &textype_sRGB_rgba_alpha : &textype_sRGB_rgba);
 	case TEXTYPE_SRGB_BGRA: return ((flags & TEXF_COMPRESS) && vid.support.ext_texture_compression_s3tc) ? ((flags & TEXF_ALPHA) ? &textype_sRGB_bgra_alpha_compress : &textype_sRGB_bgra_compress) : ((flags & TEXF_ALPHA) ? &textype_sRGB_bgra_alpha : &textype_sRGB_bgra);
+#endif
 	default:
 		Host_Error("R_GetTexTypeInfo: unknown texture format");
 		break;
@@ -825,7 +855,7 @@ static void r_textures_devicelost(void)
 {
 	int i, endindex;
 	gltexture_t *glt;
-	endindex = Mem_ExpandableArray_IndexRange(&texturearray);
+	endindex = (int)Mem_ExpandableArray_IndexRange(&texturearray);
 	for (i = 0;i < endindex;i++)
 	{
 		glt = (gltexture_t *) Mem_ExpandableArray_RecordAtIndex(&texturearray, i);
@@ -869,7 +899,7 @@ static void r_textures_devicerestored(void)
 {
 	int i, endindex;
 	gltexture_t *glt;
-	endindex = Mem_ExpandableArray_IndexRange(&texturearray);
+	endindex = (int)Mem_ExpandableArray_IndexRange(&texturearray);
 	for (i = 0;i < endindex;i++)
 	{
 		glt = (gltexture_t *) Mem_ExpandableArray_RecordAtIndex(&texturearray, i);
@@ -964,7 +994,9 @@ void R_Textures_Init (void)
 
 void R_Textures_Frame (void)
 {
+#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
 	static int old_aniso = 0;
+#endif
 
 	// could do procedural texture animation here, if we keep track of which
 	// textures were accessed this frame...
@@ -982,6 +1014,7 @@ void R_Textures_Frame (void)
 		colorconvertbuffer = NULL;
 	}
 
+#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
 	if (old_aniso != gl_texture_anisotropy.integer)
 	{
 		gltexture_t *glt;
@@ -1025,6 +1058,7 @@ void R_Textures_Frame (void)
 			break;
 		}
 	}
+#endif
 }
 
 static void R_MakeResizeBufferBigger(int size)
@@ -1050,6 +1084,7 @@ static void GL_SetupTextureParameters(int flags, textype_t textype, int texturet
 
 	CHECKGLERROR
 
+#ifdef GL_TEXTURE_MAX_ANISOTROPY_EXT
 	if (vid.support.ext_texture_filter_anisotropic && (flags & TEXF_MIPMAP))
 	{
 		int aniso = bound(1, gl_texture_anisotropy.integer, (int)vid.max_anisotropy);
@@ -1057,6 +1092,7 @@ static void GL_SetupTextureParameters(int flags, textype_t textype, int texturet
 			Cvar_SetValueQuick(&gl_texture_anisotropy, aniso);
 		qglTexParameteri(textureenum, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso);CHECKGLERROR
 	}
+#endif
 	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_S, wrapmode);CHECKGLERROR
 	qglTexParameteri(textureenum, GL_TEXTURE_WRAP_T, wrapmode);CHECKGLERROR
 #ifdef GL_TEXTURE_WRAP_R
@@ -1111,6 +1147,7 @@ static void GL_SetupTextureParameters(int flags, textype_t textype, int texturet
 		qglTexParameteri(textureenum, GL_TEXTURE_MAG_FILTER, gl_filter_mag);CHECKGLERROR
 	}
 
+#ifdef GL_TEXTURE_COMPARE_MODE_ARB
 	switch(textype)
 	{
 	case TEXTYPE_SHADOWMAP16_COMP:
@@ -1128,6 +1165,7 @@ static void GL_SetupTextureParameters(int flags, textype_t textype, int texturet
 	default:
 		break;
 	}
+#endif
 
 	CHECKGLERROR
 }
@@ -1281,6 +1319,7 @@ static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data)
 			oldbindtexnum = R_Mesh_TexBound(0, gltexturetypeenums[glt->texturetype]);
 			qglBindTexture(gltexturetypeenums[glt->texturetype], glt->texnum);CHECKGLERROR
 
+#ifndef USE_GLES2
 #ifdef GL_TEXTURE_COMPRESSION_HINT_ARB
 			if (qglGetCompressedTexImageARB)
 			{
@@ -1290,6 +1329,7 @@ static void R_UploadFullTexture(gltexture_t *glt, const unsigned char *data)
 					qglHint(GL_TEXTURE_COMPRESSION_HINT_ARB, GL_FASTEST);
 				CHECKGLERROR
 			}
+#endif
 #endif
 			switch(glt->texturetype)
 			{
@@ -1920,7 +1960,7 @@ rtexture_t *R_LoadTextureRenderBuffer(rtexturepool_t *rtexturepool, const char *
 	glt->inputdepth = 1;
 	glt->flags = TEXF_RENDERTARGET | TEXF_CLAMP | TEXF_FORCENEAREST;
 	glt->miplevel = 0;
-	glt->textype = texinfo;
+	glt->textype = GL_TEXTURE_2D;
 	glt->texturetype = textype;
 	glt->inputdatasize = width*height*texinfo->internalbytesperpixel;
 	glt->palette = NULL;
@@ -1931,7 +1971,7 @@ rtexture_t *R_LoadTextureRenderBuffer(rtexturepool_t *rtexturepool, const char *
 	glt->sides = glt->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
 	glt->texnum = 0;
 	glt->dirty = false;
-	glt->glisdepthstencil = glt->texturetype == TEXTYPE_DEPTHBUFFER24STENCIL8;
+	glt->glisdepthstencil = textype == TEXTYPE_DEPTHBUFFER24STENCIL8;
 	glt->gltexturetypeenum = gltexturetypeenums[glt->texturetype];
 	// init the dynamic texture attributes, too [11/22/2007 Black]
 	glt->updatecallback = NULL;
@@ -2148,6 +2188,11 @@ int R_SaveTextureDDSFile(rtexture_t *rt, const char *filename, qboolean skipunco
 #endif
 }
 
+#ifdef __ANDROID__
+// ELUAN: FIXME: separate this code
+#include "ktx10/include/ktx.h"
+#endif
+
 rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filename, qboolean srgb, int flags, qboolean *hasalphaflag, float *avgcolor, int miplevel, qboolean optionaltexture) // DDS textures are opaque, so miplevel isn't a pointer but just seen as a hint
 {
 	int i, size, dds_format_flags, dds_miplevels, dds_width, dds_height;
@@ -2168,10 +2213,154 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen
 	fs_offset_t ddsfilesize;
 	unsigned int ddssize;
 	qboolean force_swdecode, npothack;
+#ifdef __ANDROID__
+	// ELUAN: FIXME: separate this code
+	char vabuf[1024];
+	char vabuf2[1024];
+	int strsize;
+	KTX_dimensions sizes;
+#endif
 
 	if (cls.state == ca_dedicated)
 		return NULL;
 
+#ifdef __ANDROID__
+	// ELUAN: FIXME: separate this code
+	if (vid.renderpath != RENDERPATH_GLES2)
+	{
+		Con_DPrintf("KTX texture format is only supported on the GLES2 renderpath\n");
+		return NULL;
+	}
+
+	// some textures are specified with extensions, so it becomes .tga.dds
+	FS_StripExtension (filename, vabuf2, sizeof(vabuf2));
+	FS_StripExtension (vabuf2, vabuf, sizeof(vabuf));
+	FS_DefaultExtension (vabuf, ".ktx", sizeof(vabuf));
+	strsize = strlen(vabuf);
+	if (strsize > 5)
+	for (i = 0; i <= strsize - 4; i++) // copy null termination
+		vabuf[i] = vabuf[i + 4];
+
+	Con_DPrintf("Loading %s...\n", vabuf);
+	dds = FS_LoadFile(vabuf, tempmempool, true, &ddsfilesize);
+	ddssize = ddsfilesize;
+
+	if (!dds)
+	{
+		Con_DPrintf("Not found!\n");
+		return NULL; // not found
+	}
+	Con_DPrintf("Found!\n");
+
+	if (flags & TEXF_ALPHA)
+	{
+		Con_DPrintf("KTX texture with alpha not supported yet, disabling\n");
+		flags &= ~TEXF_ALPHA;
+	}
+
+	{
+		GLenum target;
+		GLenum glerror;
+		GLboolean isMipmapped;
+		KTX_error_code ktxerror;
+
+		glt = (gltexture_t *)Mem_ExpandableArray_AllocRecord(&texturearray);
+
+		// texture uploading can take a while, so make sure we're sending keepalives
+		CL_KeepaliveMessage(false);
+
+		// create the texture object
+		CHECKGLERROR
+		GL_ActiveTexture(0);
+		oldbindtexnum = R_Mesh_TexBound(0, gltexturetypeenums[GLTEXTURETYPE_2D]);
+		qglGenTextures(1, (GLuint *)&glt->texnum);CHECKGLERROR
+		qglBindTexture(gltexturetypeenums[GLTEXTURETYPE_2D], glt->texnum);CHECKGLERROR
+
+		// upload the texture
+		// we need to restore the texture binding after finishing the upload
+
+		// NOTE: some drivers fail with ETC1 NPOT (only PowerVR?). This may make the driver crash later.
+		ktxerror = ktxLoadTextureM(dds, ddssize, &glt->texnum, &target, &sizes, &isMipmapped, &glerror,
+								0, NULL);// can't CHECKGLERROR, the lib catches it
+
+		// FIXME: delete texture if we fail here
+		if (target != GL_TEXTURE_2D)
+		{
+			qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
+			Mem_Free(dds);
+			Con_DPrintf("%s target != GL_TEXTURE_2D, target == %x\n", vabuf, target);
+			return NULL; // FIXME: delete the texture from memory
+		}
+
+		if (KTX_SUCCESS == ktxerror)
+		{
+			textype = TEXTYPE_ETC1;
+			flags &= ~TEXF_COMPRESS; // don't let the textype be wrong
+
+			// return whether this texture is transparent
+			if (hasalphaflag)
+				*hasalphaflag = (flags & TEXF_ALPHA) != 0;
+
+			// TODO: apply gl_picmip
+			// TODO: avgcolor
+			// TODO: srgb
+			// TODO: only load mipmaps if requested
+
+			if (isMipmapped)
+				flags |= TEXF_MIPMAP;
+			else
+				flags &= ~TEXF_MIPMAP;
+
+			texinfo = R_GetTexTypeInfo(textype, flags);
+
+			strlcpy (glt->identifier, vabuf, sizeof(glt->identifier));
+			glt->pool = pool;
+			glt->chain = pool->gltchain;
+			pool->gltchain = glt;
+			glt->inputwidth = sizes.width;
+			glt->inputheight = sizes.height;
+			glt->inputdepth = 1;
+			glt->flags = flags;
+			glt->textype = texinfo;
+			glt->texturetype = GLTEXTURETYPE_2D;
+			glt->inputdatasize = ddssize;
+			glt->glinternalformat = texinfo->glinternalformat;
+			glt->glformat = texinfo->glformat;
+			glt->gltype = texinfo->gltype;
+			glt->bytesperpixel = texinfo->internalbytesperpixel;
+			glt->sides = 1;
+			glt->gltexturetypeenum = gltexturetypeenums[glt->texturetype];
+			glt->tilewidth = sizes.width;
+			glt->tileheight = sizes.height;
+			glt->tiledepth = 1;
+			glt->miplevels = isMipmapped ? 1 : 0; // FIXME
+
+				// after upload we have to set some parameters...
+#ifdef GL_TEXTURE_MAX_LEVEL
+			/* FIXME
+				if (dds_miplevels >= 1 && !mipcomplete)
+				{
+					// need to set GL_TEXTURE_MAX_LEVEL
+					qglTexParameteri(gltexturetypeenums[glt->texturetype], GL_TEXTURE_MAX_LEVEL, dds_miplevels - 1);CHECKGLERROR
+				}
+			*/
+#endif
+				GL_SetupTextureParameters(glt->flags, glt->textype->textype, glt->texturetype);
+
+				qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
+				Mem_Free(dds);
+				return (rtexture_t *)glt;
+		}
+		else
+		{
+			qglBindTexture(gltexturetypeenums[glt->texturetype], oldbindtexnum);CHECKGLERROR
+			Mem_Free(dds);
+			Con_DPrintf("KTX texture %s failed to load: %x\n", vabuf, ktxerror);
+			return NULL;
+		}
+	}
+#endif // __ANDROID__
+
 	dds = FS_LoadFile(filename, tempmempool, true, &ddsfilesize);
 	ddssize = ddsfilesize;