diff --git a/360/xdk360_video.cpp b/360/xdk360_video.cpp index 80fd619c85..2d219d6c29 100644 --- a/360/xdk360_video.cpp +++ b/360/xdk360_video.cpp @@ -116,7 +116,7 @@ HRESULT PackedResource::Create( const char * strFilename ) m_dwVidMemDataSize = xprh.dwDataSize; // Allocate memory - m_pSysMemData = new BYTE[m_dwSysMemDataSize]; + m_pSysMemData = (BYTE*)malloc(m_dwSysMemDataSize); if( m_pSysMemData == NULL ) { SSNES_ERR( "Could not allocate system memory.\n" ); @@ -131,7 +131,7 @@ HRESULT PackedResource::Create( const char * strFilename ) SSNES_ERR( "Could not allocate physical memory.\n" ); m_dwSysMemDataSize = 0; m_dwVidMemDataSize = 0; - delete[] m_pSysMemData; + free(m_pSysMemData); m_pSysMemData = NULL; return E_FAIL; } diff --git a/360/xdk360_video_resources.h b/360/xdk360_video_resources.h index e4e7aa3695..da59925e1d 100644 --- a/360/xdk360_video_resources.h +++ b/360/xdk360_video_resources.h @@ -96,16 +96,6 @@ public: return ( D3DArrayTexture* )GetResource( dwOffset ); } - D3DCubeTexture* GetCubemap( unsigned long dwOffset ) const - { - return ( D3DCubeTexture* )GetResource( dwOffset ); - } - - D3DVolumeTexture* GetVolumeTexture( unsigned long dwOffset ) const - { - return ( D3DVolumeTexture* )GetResource( dwOffset ); - } - D3DVertexBuffer* GetVertexBuffer( unsigned long dwOffset ) const { return ( D3DVertexBuffer* )GetResource( dwOffset ); @@ -129,16 +119,6 @@ public: return ( D3DArrayTexture* )GetResource( strName ); } - D3DCubeTexture* GetCubemap( const char * strName ) const - { - return ( D3DCubeTexture* )GetResource( strName ); - } - - D3DVolumeTexture* GetVolumeTexture( const char * strName ) const - { - return ( D3DVolumeTexture* )GetResource( strName ); - } - D3DVertexBuffer* GetVertexBuffer( const char * strName ) const { return ( D3DVertexBuffer* )GetResource( strName );