mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-23 10:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XDK) Cleanup xdk_resources.cpp

Browse Source
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));
m_controlslist.SetText(SETTING_CONTROLS_DPAD_EMULATION, strw_buffer);

27
xdk/xdk_resources.cpp
View File

@ -30,8 +30,6 @@ struct XPR_HEADER
#define XPR1_MAGIC_VALUE 0x31525058
#define XPR2_MAGIC_VALUE 0x58505232
const DWORD eXALLOCAllocatorId_AtgResource = eXALLOCAllocatorId_GameMax;
PackedResource::PackedResource()
{
m_pSysMemData = NULL;
@ -49,9 +47,9 @@ PackedResource::~PackedResource()
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;
#if defined(_XBOX1)
@ -60,33 +58,29 @@ void *PackedResource::GetData( const CHAR* strName ) const
for (DWORD i = 0; i < m_dwNumResourceTags; i++ )
#endif
{
if( !_stricmp( strName, m_pResourceTags[i].strName ) )
{
if (!strcasecmp( strName, m_pResourceTags[i].strName))
return &m_pSysMemData[m_pResourceTags[i].dwOffset];
}
}
return NULL;
}
static __forceinline void* AllocateContiguousMemory( DWORD Size, DWORD Alignment,
DWORD Protection = XALLOC_MEMPROTECT_WRITECOMBINE )
static inline void* AllocateContiguousMemory( DWORD Size, DWORD Alignment)
{
#if defined(_XBOX1)
return D3D_AllocContiguousMemory(Size, Alignment);
#elif defined(_XBOX360)
return XMemAlloc( Size, MAKE_XALLOC_ATTRIBUTES( 0, 0, 0, 0, eXALLOCAllocatorId_AtgResource,
Alignment, Protection, 0,
XALLOC_MEMTYPE_PHYSICAL ) );
return XMemAlloc( Size, MAKE_XALLOC_ATTRIBUTES( 0, 0, 0, 0, eXALLOCAllocatorId_GameMax,
Alignment, XALLOC_MEMPROTECT_WRITECOMBINE, 0, XALLOC_MEMTYPE_PHYSICAL ) );
#endif
}
static __forceinline void FreeContiguousMemory( void* pData )
static inline void FreeContiguousMemory( void* pData )
{
#if defined(_XBOX1)
return D3D_FreeContiguousMemory(pData);
#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 ) );
#endif
}
@ -164,13 +158,9 @@ HRESULT PackedResource::Create( const char *strFilename )
#if defined(_XBOX1)
if( xprh.dwMagic == XPR0_MAGIC_VALUE )
{
bHasResourceOffsetsTable = FALSE;
}
else if( xprh.dwMagic == XPR1_MAGIC_VALUE )
{
bHasResourceOffsetsTable = TRUE;
}
else
#elif defined(_XBOX360)
if(!retval)
@ -299,6 +289,7 @@ void PackedResource::Destroy()
if (m_pVidMemData != NULL)
FreeContiguousMemory(m_pVidMemData);
m_pVidMemData = NULL;
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_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_INDEXBUFFER = ( ( 'I' << 24 ) | ( 'B' << 16 ) | ( 'U' << 8 ) | ( 'F' ) ),
RESOURCETYPE_EOF = 0xffffffff
@ -108,20 +106,9 @@ class PackedResource
LPDIRECT3DTEXTURE GetTexture( DWORD dwOffset ) const
{ 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
{ return (LPDIRECT3DVERTEXBUFFER)GetResource( dwOffset ); }
#ifdef _XBOX1
LPDIRECT3DPUSHBUFFER8 GetPushBuffer( DWORD dwOffset ) const
{ return (LPDIRECT3DPUSHBUFFER8)GetResource( dwOffset ); }
#endif
// Functions to retrieve resources by their name
void *GetData( const CHAR* strName ) const;
@ -131,20 +118,9 @@ class PackedResource
LPDIRECT3DTEXTURE GetTexture( const CHAR* strName ) const
{ 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
{ return (LPDIRECT3DVERTEXBUFFER)GetResource( strName ); }
#ifdef _XBOX1
LPDIRECT3DPUSHBUFFER8 GetPushBuffer( const CHAR* strName ) const
{ return (LPDIRECT3DPUSHBUFFER8)GetResource( strName ); }
#endif
// Constructor/destructor
PackedResource();
~PackedResource();