ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(XDK) Cleanup xdk_resources.cpp

This commit is contained in:
twinaphex 2013-03-13 01:51:03 +01:00
parent 2718847f11
commit afc90aa33d
3 changed files with 19 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/menu/rmenu_xui.cpp
View File

@ -551,7 +551,7 @@ HRESULT CRetroArchControls::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
} }
} }
set_dpad_emulation_label(controlno, buttons[current_index], sizeof(buttons[curent_index])); set_dpad_emulation_label(controlno, buttons[current_index], sizeof(buttons[current_index]));
convert_char_to_wchar(strw_buffer, buttons[current_index], sizeof(strw_buffer)); convert_char_to_wchar(strw_buffer, buttons[current_index], sizeof(strw_buffer));
m_controlslist.SetText(SETTING_CONTROLS_DPAD_EMULATION, strw_buffer); m_controlslist.SetText(SETTING_CONTROLS_DPAD_EMULATION, strw_buffer);

45
xdk/xdk_resources.cpp
View File

@ -30,8 +30,6 @@ struct XPR_HEADER
#define XPR1_MAGIC_VALUE 0x31525058 #define XPR1_MAGIC_VALUE 0x31525058
#define XPR2_MAGIC_VALUE 0x58505232 #define XPR2_MAGIC_VALUE 0x58505232
const DWORD eXALLOCAllocatorId_AtgResource = eXALLOCAllocatorId_GameMax;
PackedResource::PackedResource() PackedResource::PackedResource()
{ {
m_pSysMemData = NULL; m_pSysMemData = NULL;
@ -49,44 +47,40 @@ PackedResource::~PackedResource()
Destroy(); Destroy();
} }
void *PackedResource::GetData( const CHAR* strName ) const void *PackedResource::GetData( const char *strName ) const
{ {
if( NULL == m_pResourceTags || NULL == strName ) if (m_pResourceTags == NULL || strName == NULL)
return NULL; return NULL;
#if defined(_XBOX1) #if defined(_XBOX1)
for( DWORD i=0; m_pResourceTags[i].strName; i++ ) for (DWORD i=0; m_pResourceTags[i].strName; i++ )
#elif defined(_XBOX360) #elif defined(_XBOX360)
for( DWORD i = 0; i < m_dwNumResourceTags; i++ ) for (DWORD i = 0; i < m_dwNumResourceTags; i++ )
#endif #endif
{ {
if( !_stricmp( strName, m_pResourceTags[i].strName ) ) if (!strcasecmp( strName, m_pResourceTags[i].strName))
{
return &m_pSysMemData[m_pResourceTags[i].dwOffset]; return &m_pSysMemData[m_pResourceTags[i].dwOffset];
}
} }
return NULL; return NULL;
} }
static __forceinline void* AllocateContiguousMemory( DWORD Size, DWORD Alignment, static inline void* AllocateContiguousMemory( DWORD Size, DWORD Alignment)
DWORD Protection = XALLOC_MEMPROTECT_WRITECOMBINE )
{ {
#if defined(_XBOX1) #if defined(_XBOX1)
return D3D_AllocContiguousMemory(Size, Alignment); return D3D_AllocContiguousMemory(Size, Alignment);
#elif defined(_XBOX360) #elif defined(_XBOX360)
return XMemAlloc( Size, MAKE_XALLOC_ATTRIBUTES( 0, 0, 0, 0, eXALLOCAllocatorId_AtgResource, return XMemAlloc( Size, MAKE_XALLOC_ATTRIBUTES( 0, 0, 0, 0, eXALLOCAllocatorId_GameMax,
Alignment, Protection, 0, Alignment, XALLOC_MEMPROTECT_WRITECOMBINE, 0, XALLOC_MEMTYPE_PHYSICAL ) );
XALLOC_MEMTYPE_PHYSICAL ) );
#endif #endif
} }
static __forceinline void FreeContiguousMemory( void* pData ) static inline void FreeContiguousMemory( void* pData )
{ {
#if defined(_XBOX1) #if defined(_XBOX1)
return D3D_FreeContiguousMemory(pData); return D3D_FreeContiguousMemory(pData);
#elif defined(_XBOX360) #elif defined(_XBOX360)
return XMemFree( pData, MAKE_XALLOC_ATTRIBUTES( 0, 0, 0, 0, eXALLOCAllocatorId_AtgResource, return XMemFree( pData, MAKE_XALLOC_ATTRIBUTES( 0, 0, 0, 0, eXALLOCAllocatorId_GameMax,
0, 0, 0, XALLOC_MEMTYPE_PHYSICAL ) ); 0, 0, 0, XALLOC_MEMTYPE_PHYSICAL ) );
#endif #endif
} }
@ -164,13 +158,9 @@ HRESULT PackedResource::Create( const char *strFilename )
#if defined(_XBOX1) #if defined(_XBOX1)
if( xprh.dwMagic == XPR0_MAGIC_VALUE ) if( xprh.dwMagic == XPR0_MAGIC_VALUE )
{
bHasResourceOffsetsTable = FALSE; bHasResourceOffsetsTable = FALSE;
}
else if( xprh.dwMagic == XPR1_MAGIC_VALUE ) else if( xprh.dwMagic == XPR1_MAGIC_VALUE )
{
bHasResourceOffsetsTable = TRUE; bHasResourceOffsetsTable = TRUE;
}
else else
#elif defined(_XBOX360) #elif defined(_XBOX360)
if(!retval) if(!retval)
@ -199,7 +189,7 @@ HRESULT PackedResource::Create( const char *strFilename )
// Allocate memory // Allocate memory
m_pSysMemData = (BYTE*)malloc(m_dwSysMemDataSize); m_pSysMemData = (BYTE*)malloc(m_dwSysMemDataSize);
if( m_pSysMemData == NULL ) if (m_pSysMemData == NULL)
{ {
RARCH_ERR( "Could not allocate system memory.\n" ); RARCH_ERR( "Could not allocate system memory.\n" );
m_dwSysMemDataSize = 0; m_dwSysMemDataSize = 0;
@ -283,11 +273,11 @@ HRESULT PackedResource::Create( const char *strFilename )
void PackedResource::GetResourceTags( DWORD* pdwNumResourceTags, void PackedResource::GetResourceTags( DWORD* pdwNumResourceTags,
XBRESOURCE** ppResourceTags ) XBRESOURCE** ppResourceTags )
{ {
if( pdwNumResourceTags ) if (pdwNumResourceTags)
( *pdwNumResourceTags ) = m_dwNumResourceTags; (*pdwNumResourceTags) = m_dwNumResourceTags;
if( ppResourceTags ) if (ppResourceTags )
( *ppResourceTags ) = m_pResourceTags; (*ppResourceTags) = m_pResourceTags;
} }
#endif #endif
@ -297,8 +287,9 @@ void PackedResource::Destroy()
m_pSysMemData = NULL; m_pSysMemData = NULL;
m_dwSysMemDataSize = 0L; m_dwSysMemDataSize = 0L;
if( m_pVidMemData != NULL ) if (m_pVidMemData != NULL)
FreeContiguousMemory( m_pVidMemData ); FreeContiguousMemory(m_pVidMemData);
m_pVidMemData = NULL; m_pVidMemData = NULL;
m_dwVidMemDataSize = 0L; m_dwVidMemDataSize = 0L;

24
xdk/xdk_resources.h
View File

@ -39,8 +39,6 @@ enum
{ {
RESOURCETYPE_USERDATA = ( ( 'U' << 24 ) | ( 'S' << 16 ) | ( 'E' << 8 ) | ( 'R' ) ), RESOURCETYPE_USERDATA = ( ( 'U' << 24 ) | ( 'S' << 16 ) | ( 'E' << 8 ) | ( 'R' ) ),
RESOURCETYPE_TEXTURE = ( ( 'T' << 24 ) | ( 'X' << 16 ) | ( '2' << 8 ) | ( 'D' ) ), RESOURCETYPE_TEXTURE = ( ( 'T' << 24 ) | ( 'X' << 16 ) | ( '2' << 8 ) | ( 'D' ) ),
RESOURCETYPE_CUBEMAP = ( ( 'T' << 24 ) | ( 'X' << 16 ) | ( 'C' << 8 ) | ( 'M' ) ),
RESOURCETYPE_VOLUMETEXTURE = ( ( 'T' << 24 ) | ( 'X' << 16 ) | ( '3' << 8 ) | ( 'D' ) ),
RESOURCETYPE_VERTEXBUFFER = ( ( 'V' << 24 ) | ( 'B' << 16 ) | ( 'U' << 8 ) | ( 'F' ) ), RESOURCETYPE_VERTEXBUFFER = ( ( 'V' << 24 ) | ( 'B' << 16 ) | ( 'U' << 8 ) | ( 'F' ) ),
RESOURCETYPE_INDEXBUFFER = ( ( 'I' << 24 ) | ( 'B' << 16 ) | ( 'U' << 8 ) | ( 'F' ) ), RESOURCETYPE_INDEXBUFFER = ( ( 'I' << 24 ) | ( 'B' << 16 ) | ( 'U' << 8 ) | ( 'F' ) ),
RESOURCETYPE_EOF = 0xffffffff RESOURCETYPE_EOF = 0xffffffff
@ -108,20 +106,9 @@ class PackedResource
LPDIRECT3DTEXTURE GetTexture( DWORD dwOffset ) const LPDIRECT3DTEXTURE GetTexture( DWORD dwOffset ) const
{ return (LPDIRECT3DTEXTURE)GetResource( dwOffset ); } { return (LPDIRECT3DTEXTURE)GetResource( dwOffset ); }
LPDIRECT3DCUBETEXTURE GetCubemap( DWORD dwOffset ) const
{ return (LPDIRECT3DCUBETEXTURE)GetResource( dwOffset ); }
LPDIRECT3DVOLUMETEXTURE GetVolumeTexture( DWORD dwOffset ) const
{ return (LPDIRECT3DVOLUMETEXTURE)GetResource( dwOffset ); }
LPDIRECT3DVERTEXBUFFER GetVertexBuffer( DWORD dwOffset ) const LPDIRECT3DVERTEXBUFFER GetVertexBuffer( DWORD dwOffset ) const
{ return (LPDIRECT3DVERTEXBUFFER)GetResource( dwOffset ); } { return (LPDIRECT3DVERTEXBUFFER)GetResource( dwOffset ); }
#ifdef _XBOX1
LPDIRECT3DPUSHBUFFER8 GetPushBuffer( DWORD dwOffset ) const
{ return (LPDIRECT3DPUSHBUFFER8)GetResource( dwOffset ); }
#endif
// Functions to retrieve resources by their name // Functions to retrieve resources by their name
void *GetData( const CHAR* strName ) const; void *GetData( const CHAR* strName ) const;
@ -131,20 +118,9 @@ class PackedResource
LPDIRECT3DTEXTURE GetTexture( const CHAR* strName ) const LPDIRECT3DTEXTURE GetTexture( const CHAR* strName ) const
{ return (LPDIRECT3DTEXTURE)GetResource( strName ); } { return (LPDIRECT3DTEXTURE)GetResource( strName ); }
LPDIRECT3DCUBETEXTURE GetCubemap( const CHAR* strName ) const
{ return (LPDIRECT3DCUBETEXTURE)GetResource( strName ); }
LPDIRECT3DVOLUMETEXTURE GetVolumeTexture( const CHAR* strName ) const
{ return (LPDIRECT3DVOLUMETEXTURE)GetResource( strName ); }
LPDIRECT3DVERTEXBUFFER GetVertexBuffer( const CHAR* strName ) const LPDIRECT3DVERTEXBUFFER GetVertexBuffer( const CHAR* strName ) const
{ return (LPDIRECT3DVERTEXBUFFER)GetResource( strName ); } { return (LPDIRECT3DVERTEXBUFFER)GetResource( strName ); }
#ifdef _XBOX1
LPDIRECT3DPUSHBUFFER8 GetPushBuffer( const CHAR* strName ) const
{ return (LPDIRECT3DPUSHBUFFER8)GetResource( strName ); }
#endif
// Constructor/destructor // Constructor/destructor
PackedResource(); PackedResource();
~PackedResource(); ~PackedResource();