Remove pointer to RageSurface's own RageSurfaceFormat.

Author: xwidghet

src/BannerCache.cpp

@@ -233,7 +233,7 @@ struct BannerTexture: public RageTexture
 		/* Find a supported texture format. If it happens to match the stored
 		 * file, we won't have to do any conversion here, and that'll happen
 		 * often with paletted images. */
-		RagePixelFormat pf = m_pImage->format->BitsPerPixel == 8? RagePixelFormat_PAL: RagePixelFormat_RGB5A1;
+		RagePixelFormat pf = m_pImage->fmt.BitsPerPixel == 8? RagePixelFormat_PAL: RagePixelFormat_RGB5A1;
 		if( !DISPLAY->SupportsTextureFormat(pf) )
 			pf = RagePixelFormat_RGBA4;
 

src/RageBitmapTexture.cpp

@@ -129,7 +129,7 @@ void RageBitmapTexture::Create()
 	/* No iGrayscaleBits for images that are already paletted.  We don't support
 	 * that; and that hint is intended for use on images that are already grayscale,
 	 * it's not intended to change a color image into a grayscale image. */
-	if( actualID.iGrayscaleBits != -1 && pImg->format->BitsPerPixel == 8 )
+	if( actualID.iGrayscaleBits != -1 && pImg->fmt.BitsPerPixel == 8 )
 		actualID.iGrayscaleBits = -1;
 
 	/* Cap the max texture size to the hardware max. */
@@ -195,7 +195,7 @@ void RageBitmapTexture::Create()
 	RagePixelFormat pixfmt;
 
 	// If the source is palleted, always load as paletted if supported.
-	if( pImg->format->BitsPerPixel == 8 && DISPLAY->SupportsTextureFormat(RagePixelFormat_PAL) )
+	if( pImg->fmt.BitsPerPixel == 8 && DISPLAY->SupportsTextureFormat(RagePixelFormat_PAL) )
 	{
 		pixfmt = RagePixelFormat_PAL;
 	}
@@ -207,7 +207,7 @@ void RageBitmapTexture::Create()
 		case 16:
 			{
 				// Bits of alpha in the source:
-				int iSourceAlphaBits = 8 - pImg->format->Loss[3];
+				int iSourceAlphaBits = 8 - pImg->fmt.Loss[3];
 
 				// Don't use more than we were hinted to.
 				iSourceAlphaBits = min( actualID.iAlphaBits, iSourceAlphaBits );

src/RageDisplay_D3D.cpp

@@ -701,9 +701,9 @@ RageSurface* RageDisplay_D3D::CreateScreenshot()
 				// We need to make a copy, since lr.pBits will go away when we call UnlockRect().
 				result = 
 					CreateSurface( surface->w, surface->h,
-						surface->format->BitsPerPixel,
-						surface->format->Rmask, surface->format->Gmask,
-						surface->format->Bmask, surface->format->Amask );
+						surface->fmt.BitsPerPixel,
+						surface->fmt.Rmask, surface->fmt.Gmask,
+						surface->fmt.Bmask, surface->fmt.Amask );
 				RageSurfaceUtils::CopySurface( surface, result );
 				delete surface;
 
@@ -1466,9 +1466,9 @@ unsigned RageDisplay_D3D::CreateTexture(
 		// Save palette
 		TexturePalette pal;
 		memset( pal.p, 0, sizeof(pal.p) );
-		for( int i=0; i<img->format->palette->ncolors; i++ )
+		for( int i=0; i<img->fmt.palette->ncolors; i++ )
 		{
-			RageSurfaceColor &c = img->format->palette->colors[i];
+			RageSurfaceColor &c = img->fmt.palette->colors[i];
 			pal.p[i].peRed = c.r;
 			pal.p[i].peGreen = c.g;
 			pal.p[i].peBlue = c.b;

src/RageDisplay_OGL.cpp

@@ -2053,7 +2053,7 @@ void RageDisplay_Legacy::DeleteTexture( unsigned iTexture )
 
 RagePixelFormat RageDisplay_Legacy::GetImgPixelFormat( RageSurface* &img, bool &bFreeImg, int width, int height, bool bPalettedTexture )
 {
-	RagePixelFormat pixfmt = FindPixelFormat( img->format->BitsPerPixel, img->format->Rmask, img->format->Gmask, img->format->Bmask, img->format->Amask );
+	RagePixelFormat pixfmt = FindPixelFormat( img->fmt.BitsPerPixel, img->fmt.Rmask, img->fmt.Gmask, img->fmt.Bmask, img->fmt.Amask );
 
 	/* If img is paletted, we're setting up a non-paletted texture, and color indexes
 	 * are too small, depalettize. */
@@ -2137,7 +2137,7 @@ unsigned RageDisplay_Legacy::CreateTexture(
 
 	/* If the image is paletted, but we're not sending it to a paletted image,
 	 * set up glPixelMap. */
-	SetPixelMapForSurface( glImageFormat, glTexFormat, pImg->format->palette );
+	SetPixelMapForSurface( glImageFormat, glTexFormat, pImg->fmt.palette );
 
 	// HACK:  OpenGL 1.2 types aren't available in GLU 1.3.  Don't call GLU for mip
 	// mapping if we're using an OGL 1.2 type and don't have >= GLU 1.3.
@@ -2180,7 +2180,7 @@ unsigned RageDisplay_Legacy::CreateTexture(
 	SetTextureFiltering( TextureUnit_1, true );
 	SetTextureWrapping( TextureUnit_1, false );
 
-	glPixelStorei( GL_UNPACK_ROW_LENGTH, pImg->pitch / pImg->format->BytesPerPixel );
+	glPixelStorei( GL_UNPACK_ROW_LENGTH, pImg->pitch / pImg->fmt.BytesPerPixel );
 
 
 	if (pixfmt == RagePixelFormat_PAL)
@@ -2190,12 +2190,12 @@ unsigned RageDisplay_Legacy::CreateTexture(
 		memset( palette, 0, sizeof(palette) );
 		int p = 0;
 		/* Copy the palette to the format OpenGL expects. */
-		for( int i = 0; i < pImg->format->palette->ncolors; ++i )
+		for( int i = 0; i < pImg->fmt.palette->ncolors; ++i )
 		{
-			palette[p++] = pImg->format->palette->colors[i].r;
-			palette[p++] = pImg->format->palette->colors[i].g;
-			palette[p++] = pImg->format->palette->colors[i].b;
-			palette[p++] = pImg->format->palette->colors[i].a;
+			palette[p++] = pImg->fmt.palette->colors[i].r;
+			palette[p++] = pImg->fmt.palette->colors[i].g;
+			palette[p++] = pImg->fmt.palette->colors[i].b;
+			palette[p++] = pImg->fmt.palette->colors[i].a;
 		}
 
 		/* Set the palette. */
@@ -2346,18 +2346,18 @@ void RageDisplay_Legacy::UpdateTexture(
 	bool bFreeImg;
 	RagePixelFormat SurfacePixFmt = GetImgPixelFormat( pImg, bFreeImg, iWidth, iHeight, false );
 
-	glPixelStorei( GL_UNPACK_ROW_LENGTH, pImg->pitch / pImg->format->BytesPerPixel );
+	glPixelStorei( GL_UNPACK_ROW_LENGTH, pImg->pitch / pImg->fmt.BytesPerPixel );
 
 	GLenum glImageFormat = g_GLPixFmtInfo[SurfacePixFmt].format;
 	GLenum glImageType = g_GLPixFmtInfo[SurfacePixFmt].type;
 
 	/* If the image is paletted, but we're not sending it to a paletted image,
 	 * set up glPixelMap. */
-	if (pImg->format->palette)
+	if (pImg->fmt.palette)
 	{
 		GLenum glTexFormat = 0;
 		glGetTexLevelParameteriv( GL_PROXY_TEXTURE_2D, 0, GLenum(GL_TEXTURE_INTERNAL_FORMAT), (GLint *) &glTexFormat );
-		SetPixelMapForSurface( glImageFormat, glTexFormat, pImg->format->palette );
+		SetPixelMapForSurface( glImageFormat, glTexFormat, pImg->fmt.palette );
 	}
 
 	glTexSubImage2D( GL_TEXTURE_2D, 0,

src/RageSurface.cpp

@@ -118,15 +118,12 @@ bool RageSurfaceFormat::Equivalent( const RageSurfaceFormat &rhs ) const
 
 RageSurface::RageSurface()
 {
-	format = &fmt;
 	pixels = NULL;
 	pixels_owned = true;
 }
 
 RageSurface::RageSurface( const RageSurface &cpy )
 {
-	format = &fmt;
-
 	w = cpy.w;
 	h = cpy.h;
 	pitch = cpy.pitch;

src/RageSurface.h

@@ -70,7 +70,6 @@ struct RageSurfaceFormat
 
 struct RageSurface
 {
-	RageSurfaceFormat *format; /* compatibility only */
 	RageSurfaceFormat fmt;
 
 	uint8_t *pixels;