From 3a84270a844a52bccb2b4bfbfb61a6bfd7a35322 Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Mon, 9 Dec 2013 05:27:09 +0100
Subject: [PATCH] Textures with DSDT/DUDV format will now be uploaded as RG8.
 Ryzom will now not crash while entering world.

--HG--
branch : gsoc2013-dfighter
---
 .../driver/opengl3/driver_opengl_texture.cpp  | 46 ++++++-------------
 1 file changed, 15 insertions(+), 31 deletions(-)

diff --git a/code/nel/src/3d/driver/opengl3/driver_opengl_texture.cpp b/code/nel/src/3d/driver/opengl3/driver_opengl_texture.cpp
index bb0be4087..947582a55 100644
--- a/code/nel/src/3d/driver/opengl3/driver_opengl_texture.cpp
+++ b/code/nel/src/3d/driver/opengl3/driver_opengl_texture.cpp
@@ -372,9 +372,10 @@ GLint	CDriverGL3::getGlTextureFormat(ITexture& tex, bool &compressed)
 		case ITexture::AlphaLuminance: return GL_LUMINANCE8_ALPHA8;
 		case ITexture::DsDt:
 			{
+				return GL_RG8;
 				// Used to check for ATI EMBM stuff
-				nlassert(0);
-				return 0;
+				//nlassert(0);
+				//return 0;
 			}
 		break;
 		default:
@@ -401,34 +402,20 @@ static GLint	getGlSrcTextureFormat(ITexture &tex, GLint glfmt)
 		}
 	}
 
-	if (glfmt == GL_DSDT_NV)
-	{
-		return GL_DSDT_NV;
-	}
-
-	if (glfmt == GL_DU8DV8_ATI)
-	{
-		return GL_DUDV_ATI;
-	}
+	if( glfmt == GL_RG8 )
+		return GL_RG;
 
 	// Else, not a Src format for upload, or RGBA.
 	return GL_RGBA;
 }
 
 // ***************************************************************************
-static GLenum getGlSrcTextureComponentType(GLint texSrcFormat)
+static GLenum getGlSrcTextureComponentType( ITexture &tex, GLint texSrcFormat)
 {
 	H_AUTO_OGL(getGlSrcTextureComponentType);
 
-	switch (texSrcFormat)
-	{
-		case GL_DSDT_NV:
-		case GL_DUDV_ATI:
-			return GL_BYTE; // these are signed format
-		break;
-		default:
-		break;
-	}
+	if( tex.getPixelFormat() == CBitmap::DsDt )
+		return GL_BYTE;
 
 	return GL_UNSIGNED_BYTE;
 }
@@ -491,12 +478,9 @@ uint				CDriverGL3::computeMipMapMemoryUsage(uint w, uint h, GLint glfmt) const
 #ifdef GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
 	case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:	return w*h* 1;
 #endif
-#ifdef GL_DU8DV8_ATI
-	case GL_DU8DV8_ATI:
-#endif
-#ifdef GL_DSDT_NV
-	case GL_DSDT_NV:						return w*h* 2;
-#endif
+
+	case GL_RG8:
+		return w * h * 2;
 	}
 
 	// One format has not been coded.
@@ -893,7 +877,7 @@ bool CDriverGL3::setupTextureEx (ITexture& tex, bool bUpload, bool &bAllUploaded
 					// Get the correct texture format from texture...
 					GLint	glfmt= getGlTextureFormat(*pTInTC, gltext->Compressed);
 					GLint	glSrcFmt= getGlSrcTextureFormat(*pTInTC, glfmt);
-					GLenum  glSrcType= getGlSrcTextureComponentType(glSrcFmt);
+					GLenum  glSrcType= getGlSrcTextureComponentType(*pTInTC,glSrcFmt);
 
 					sint	nMipMaps;
 					if(glSrcFmt==GL_RGBA && pTInTC->getPixelFormat()!=CBitmap::RGBA )
@@ -943,7 +927,7 @@ bool CDriverGL3::setupTextureEx (ITexture& tex, bool bUpload, bool &bAllUploaded
 					// Get the correct texture format from texture...
 					GLint	glfmt= getGlTextureFormat(tex, gltext->Compressed);
 					GLint	glSrcFmt= getGlSrcTextureFormat(tex, glfmt);
-					GLenum  glSrcType= getGlSrcTextureComponentType(glSrcFmt);
+					GLenum  glSrcType= getGlSrcTextureComponentType(tex,glSrcFmt);
 
 					// DXTC: if same format, and same mipmapOn/Off, use glTexCompressedImage*.
 					// We cannot build the mipmaps if they are not here.
@@ -1067,7 +1051,7 @@ bool CDriverGL3::setupTextureEx (ITexture& tex, bool bUpload, bool &bAllUploaded
 				bool	dummy;
 				GLint	glfmt= getGlTextureFormat(tex, dummy);
 				GLint	glSrcFmt= getGlSrcTextureFormat(tex, glfmt);
-				GLenum  glSrcType= getGlSrcTextureComponentType(glSrcFmt);
+				GLenum  glSrcType= getGlSrcTextureComponentType(tex,glSrcFmt);
 
 				sint	nMipMaps;
 				if(glSrcFmt==GL_RGBA && tex.getPixelFormat()!=CBitmap::RGBA )
@@ -1197,7 +1181,7 @@ bool CDriverGL3::uploadTexture (ITexture& tex, CRect& rect, uint8 nNumMipMap)
 	bool dummy;
 	GLint glfmt = getGlTextureFormat (tex, dummy);
 	GLint glSrcFmt = getGlSrcTextureFormat (tex, glfmt);
-	GLenum  glSrcType= getGlSrcTextureComponentType(glSrcFmt);
+	GLenum  glSrcType= getGlSrcTextureComponentType(tex,glSrcFmt);
 
 	// If DXTC format
 	if (_Extensions.EXTTextureCompressionS3TC && sameDXTCFormat(tex, glfmt))