mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-26 18:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

(360) Some cleanups to xdk360_video_resources

Browse Source
This commit is contained in:
TwinAphex51224 2012-03-29 17:27:42 +02:00
parent a33c610149
commit a7b486cef1
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
360/xdk360_video.cpp
View File

@ -116,7 +116,7 @@ HRESULT PackedResource::Create( const char * strFilename )
m_dwVidMemDataSize = xprh.dwDataSize; m_dwVidMemDataSize = xprh.dwDataSize;
// Allocate memory // Allocate memory
m_pSysMemData = new BYTE[m_dwSysMemDataSize]; m_pSysMemData = (BYTE*)malloc(m_dwSysMemDataSize);
if( m_pSysMemData == NULL ) if( m_pSysMemData == NULL )
{ {
SSNES_ERR( "Could not allocate system memory.\n" ); 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" ); SSNES_ERR( "Could not allocate physical memory.\n" );
m_dwSysMemDataSize = 0; m_dwSysMemDataSize = 0;
m_dwVidMemDataSize = 0; m_dwVidMemDataSize = 0;
delete[] m_pSysMemData; free(m_pSysMemData);
m_pSysMemData = NULL; m_pSysMemData = NULL;
return E_FAIL; return E_FAIL;
} }

20
360/xdk360_video_resources.h
View File

@ -96,16 +96,6 @@ public:
return ( D3DArrayTexture* )GetResource( dwOffset ); 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 D3DVertexBuffer* GetVertexBuffer( unsigned long dwOffset ) const
{ {
return ( D3DVertexBuffer* )GetResource( dwOffset ); return ( D3DVertexBuffer* )GetResource( dwOffset );
@ -129,16 +119,6 @@ public:
return ( D3DArrayTexture* )GetResource( strName ); 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 D3DVertexBuffer* GetVertexBuffer( const char * strName ) const
{ {
return ( D3DVertexBuffer* )GetResource( strName ); return ( D3DVertexBuffer* )GetResource( strName );