From 8f29e21c9f5df5376d96bc6549d0f4fdec382308 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 21 Feb 2007 03:54:12 +0000 Subject: [PATCH] always use 0 for the default texture --- stepmania/src/RageDisplay.h | 3 --- stepmania/src/RageDisplay_D3D.h | 1 - stepmania/src/RageDisplay_Null.h | 1 - stepmania/src/RageDisplay_OGL.h | 1 - stepmania/src/RageTextureManager.cpp | 2 +- 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/stepmania/src/RageDisplay.h b/stepmania/src/RageDisplay.h index e7804c22d2..683cf12fd8 100644 --- a/stepmania/src/RageDisplay.h +++ b/stepmania/src/RageDisplay.h @@ -196,9 +196,6 @@ public: RageSurface* img, // must be in pixfmt bool bGenerateMipMaps ) = 0; - /* Return a texture handle to the default texture, an opaque, all-white, - * immutable texture. Deleting or updating this texture has no effect. */ - virtual unsigned CreateTextureDefault() = 0; virtual void UpdateTexture( unsigned iTexHandle, RageSurface* img, diff --git a/stepmania/src/RageDisplay_D3D.h b/stepmania/src/RageDisplay_D3D.h index 80b580d595..7012d7494e 100644 --- a/stepmania/src/RageDisplay_D3D.h +++ b/stepmania/src/RageDisplay_D3D.h @@ -27,7 +27,6 @@ public: PixelFormat pixfmt, RageSurface* img, bool bGenerateMipMaps ); - unsigned CreateTextureDefault() { return 0; } void UpdateTexture( unsigned iTexHandle, RageSurface* img, diff --git a/stepmania/src/RageDisplay_Null.h b/stepmania/src/RageDisplay_Null.h index 121e23a4b0..267d910a7d 100644 --- a/stepmania/src/RageDisplay_Null.h +++ b/stepmania/src/RageDisplay_Null.h @@ -24,7 +24,6 @@ public: PixelFormat pixfmt, RageSurface* img, bool bGenerateMipMaps ) { return 1; } - unsigned CreateTextureDefault() { return 0; } void UpdateTexture( unsigned iTexHandle, RageSurface* img, diff --git a/stepmania/src/RageDisplay_OGL.h b/stepmania/src/RageDisplay_OGL.h index c6ca2c48cd..77837c9b18 100644 --- a/stepmania/src/RageDisplay_OGL.h +++ b/stepmania/src/RageDisplay_OGL.h @@ -34,7 +34,6 @@ public: PixelFormat pixfmt, RageSurface* img, bool bGenerateMipMaps ); - unsigned CreateTextureDefault() { return 0; } void UpdateTexture( unsigned iTexHandle, RageSurface* img, diff --git a/stepmania/src/RageTextureManager.cpp b/stepmania/src/RageTextureManager.cpp index e2462d6e16..0483d4a447 100644 --- a/stepmania/src/RageTextureManager.cpp +++ b/stepmania/src/RageTextureManager.cpp @@ -108,7 +108,7 @@ public: RageTexture_Default(): RageTexture( RageTextureID() ) { - m_uTexHandle = DISPLAY->CreateTextureDefault(); + m_uTexHandle = 0; m_iSourceWidth = m_iSourceHeight = 1; m_iTextureWidth = m_iTextureHeight = 1; m_iImageWidth = m_iImageHeight = 1;