add stubs for asan/ubsan

materialsystem/mat_stub.cpp

@@ -20,6 +20,9 @@
 
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
+#include "mat_stub.h"
+
+CDummyTexture g_DummyTexture;
 
 // ---------------------------------------------------------------------------------------- //
 // IMaterialSystem and IMesh stub classes.
@@ -223,94 +226,6 @@ CDummyMesh* GetDummyMesh()
 	return g_pDummyMesh;
 }
 
-
-// ---------------------------------------------------------------------------------------- //
-// ITexture dummy implementation.
-// ---------------------------------------------------------------------------------------- //
-
-class CDummyTexture : public ITexture
-{
-public:
-	// Various texture polling methods
-	virtual const char *GetName( void ) const { return "DummyTexture"; }
-	virtual int GetMappingWidth() const { return 512; }
-	virtual int GetMappingHeight() const { return 512; }
-	virtual int GetActualWidth() const { return 512; }
-	virtual int GetActualHeight() const { return 512; }
-	virtual int GetNumAnimationFrames() const { return 0; }
-	virtual bool IsTranslucent() const { return false; }
-	virtual bool IsMipmapped() const { return false; }
-
-	virtual void GetLowResColorSample( float s, float t, float *color ) const {}
-
-	// Gets texture resource data of the specified type.
-	// Params:
-	//		eDataType		type of resource to retrieve.
-	//		pnumBytes		on return is the number of bytes available in the read-only data buffer or is undefined
-	// Returns:
-	//		pointer to the resource data, or NULL
-	virtual void *GetResourceData( uint32 eDataType, size_t *pNumBytes ) const
-	{
-		return NULL;
-	}
-
-
-	// Methods associated with reference count
-	virtual void IncrementReferenceCount( void ) {}
-	virtual void DecrementReferenceCount( void ) {}
-
-	// Used to modify the texture bits (procedural textures only)
-	virtual void SetTextureRegenerator( ITextureRegenerator *pTextureRegen ) {}
-
-	// Reconstruct the texture bits in HW memory
-
-	// If rect is not specified, reconstruct all bits, otherwise just
-	// reconstruct a subrect.
-	virtual void Download( Rect_t *pRect = 0, int nAdditionalCreationFlags = 0 ) {}
-
-	// Uses for stats. . .get the approximate size of the texture in it's current format.
-	virtual int GetApproximateVidMemBytes( void ) const { return 64; }
-
-	virtual bool IsError() const { return false; }
-
-	virtual ITexture *GetEmbeddedTexture( int nIndex ) { return NULL; }
-
-	// For volume textures
-	virtual bool IsVolumeTexture() const { return false; }
-	virtual int GetMappingDepth() const { return 1; }
-	virtual int GetActualDepth() const { return 1; }
-
-	virtual ImageFormat GetImageFormat() const { return IMAGE_FORMAT_RGBA8888; }
-	virtual NormalDecodeMode_t GetNormalDecodeMode() const { return NORMAL_DECODE_NONE; }
-
-	// Various information about the texture
-	virtual bool IsRenderTarget() const { return false; }
-	virtual bool IsCubeMap() const { return false; }
-	virtual bool IsNormalMap() const { return false; }
-	virtual bool IsProcedural() const { return false; }
-	virtual void DeleteIfUnreferenced() {}
-
-	virtual void SwapContents( ITexture *pOther ) {}
-
-	virtual unsigned int GetFlags( void ) const { return 0; }
-	virtual void ForceLODOverride( int iNumLodsOverrideUpOrDown ) { NULL; }
-
-#if defined( _X360 )
-	virtual bool ClearTexture( int r, int g, int b, int a ) { return true; }
-	virtual bool CreateRenderTargetSurface( int width, int height, ImageFormat format, bool bSameAsTexture ) { return true; }
-#endif
-
-	// Save texture to a file.
-	virtual bool SaveToFile( const char *fileName ) { return false; }
-
-	void CopyToStagingTexture( ITexture* pDstTex ) {}
-
-	virtual void SetErrorTexture( bool bIsErrorTexture ) { }
-};
-
-CDummyTexture g_DummyTexture;
-
-
 // ---------------------------------------------------------------------------------------- //
 // Dummy implementation of IMaterialVar.
 // ---------------------------------------------------------------------------------------- //

materialsystem/mat_stub.h

@@ -0,0 +1,93 @@
+#ifndef MAT_STUB_H
+#define MAT_STUB_H
+#include "materialsystem/itexture.h"
+
+// ---------------------------------------------------------------------------------------- //
+// ITexture dummy implementation.
+// ---------------------------------------------------------------------------------------- //
+
+class CDummyTexture : public ITexture
+{
+public:
+	// Various texture polling methods
+	virtual const char *GetName( void ) const { return "DummyTexture"; }
+	virtual int GetMappingWidth() const { return 512; }
+	virtual int GetMappingHeight() const { return 512; }
+	virtual int GetActualWidth() const { return 512; }
+	virtual int GetActualHeight() const { return 512; }
+	virtual int GetNumAnimationFrames() const { return 0; }
+	virtual bool IsTranslucent() const { return false; }
+	virtual bool IsMipmapped() const { return false; }
+
+	virtual void GetLowResColorSample( float s, float t, float *color ) const {}
+
+	// Gets texture resource data of the specified type.
+	// Params:
+	//		eDataType		type of resource to retrieve.
+	//		pnumBytes		on return is the number of bytes available in the read-only data buffer or is undefined
+	// Returns:
+	//		pointer to the resource data, or NULL
+	virtual void *GetResourceData( uint32 eDataType, size_t *pNumBytes ) const
+	{
+		return NULL;
+	}
+
+
+	// Methods associated with reference count
+	virtual void IncrementReferenceCount( void ) {}
+	virtual void DecrementReferenceCount( void ) {}
+
+	// Used to modify the texture bits (procedural textures only)
+	virtual void SetTextureRegenerator( ITextureRegenerator *pTextureRegen ) {}
+
+	// Reconstruct the texture bits in HW memory
+
+	// If rect is not specified, reconstruct all bits, otherwise just
+	// reconstruct a subrect.
+	virtual void Download( Rect_t *pRect = 0, int nAdditionalCreationFlags = 0 ) {}
+
+	// Uses for stats. . .get the approximate size of the texture in it's current format.
+	virtual int GetApproximateVidMemBytes( void ) const { return 64; }
+
+	virtual bool IsError() const { return false; }
+
+	virtual ITexture *GetEmbeddedTexture( int nIndex ) { return NULL; }
+
+	// For volume textures
+	virtual bool IsVolumeTexture() const { return false; }
+	virtual int GetMappingDepth() const { return 1; }
+	virtual int GetActualDepth() const { return 1; }
+
+	virtual ImageFormat GetImageFormat() const { return IMAGE_FORMAT_RGBA8888; }
+	virtual NormalDecodeMode_t GetNormalDecodeMode() const { return NORMAL_DECODE_NONE; }
+
+	// Various information about the texture
+	virtual bool IsRenderTarget() const { return false; }
+	virtual bool IsCubeMap() const { return false; }
+	virtual bool IsNormalMap() const { return false; }
+	virtual bool IsProcedural() const { return false; }
+	virtual void DeleteIfUnreferenced() {}
+
+	virtual void SwapContents( ITexture *pOther ) {}
+
+	virtual unsigned int GetFlags( void ) const { return 0; }
+	virtual void ForceLODOverride( int iNumLodsOverrideUpOrDown ) { NULL; }
+
+#if defined( _X360 )
+	virtual bool ClearTexture( int r, int g, int b, int a ) { return true; }
+	virtual bool CreateRenderTargetSurface( int width, int height, ImageFormat format, bool bSameAsTexture ) { return true; }
+#endif
+
+	// Save texture to a file.
+	virtual bool SaveToFile( const char *fileName ) { return false; }
+
+	void CopyToStagingTexture( ITexture* pDstTex ) {}
+
+	virtual void SetErrorTexture( bool bIsErrorTexture ) { }
+};
+
+extern CDummyTexture g_DummyTexture;
+
+
+
+#endif // MAT_STUB_H

materialsystem/shadersystem.cpp

@@ -27,6 +27,7 @@
 
 // NOTE: This must be the last file included!
 #include "tier0/memdbgon.h"
+#include "mat_stub.h"
 
 
 //#define DEBUG_DEPTH 1
@@ -38,7 +39,6 @@ static ConVar mat_showenvmapmask( "mat_showenvmapmask", "0" );
 static ConVar mat_debugdepth( "mat_debugdepth", "0" );
 extern ConVar mat_supportflashlight;
 
-
 //-----------------------------------------------------------------------------
 // Implementation of the shader system
 //-----------------------------------------------------------------------------
@@ -2024,10 +2024,9 @@ void CShaderSystem::LoadCubeMap( IMaterialVar **ppParams, IMaterialVar *pTexture
 
 	if ( stricmp( pTextureVar->GetStringValue(), "env_cubemap" ) == 0 )
 	{
-		// garymcthack 
-		// don't have to load anything here. . just set the texture value to something
+		// don't have to load anything here. . just set the texture value to DummyTexture
 		// special that says to use the cubemap entity.
-		pTextureVar->SetTextureValue( ( ITexture * )-1 );
+		pTextureVar->SetTextureValue(  &g_DummyTexture );
 		SetFlags2( ppParams, MATERIAL_VAR2_USES_ENV_CUBEMAP );
 	}
 	else