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

(360) Remove PIX calls

Browse Source
This commit is contained in:
TwinAphex51224 2012-02-16 16:28:31 +01:00
parent 52402d02c5
commit fd9f020afa
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
360/xdk360_video_debugfonts.cpp
View File

@ -471,8 +471,6 @@ float XdkFont::GetTextWidth( const wchar_t * strText ) const
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
VOID XdkFont::Begin() VOID XdkFont::Begin()
{ {
PIXBeginNamedEvent( 0, "Text Rendering" );
// Set state on the first call // Set state on the first call
if( m_dwNestedBeginCount == 0 ) if( m_dwNestedBeginCount == 0 )
{ {
@ -575,11 +573,6 @@ VOID XdkFont::DrawText( float fOriginX, float fOriginY, unsigned long dwColor,
xdk360_video_t *vid = (xdk360_video_t*)g_d3d; xdk360_video_t *vid = (xdk360_video_t*)g_d3d;
D3DDevice *pd3dDevice = vid->xdk360_render_device; D3DDevice *pd3dDevice = vid->xdk360_render_device;
// Create a PIX user-defined event that encapsulates all of the text draw calls.
// This makes DrawText calls easier to recognize in PIX captures, and it makes
// them take up fewer entries in the event list.
PIXBeginNamedEvent( dwColor, "DrawText: %S", strText );
// Set the color as a vertex shader constant // Set the color as a vertex shader constant
float vColor[4]; float vColor[4];
@ -752,9 +745,6 @@ VOID XdkFont::DrawText( float fOriginX, float fOriginY, unsigned long dwColor,
// Call End() to complete the begin/end pair for drawing text // Call End() to complete the begin/end pair for drawing text
End(); End();
// Close off the user-defined event opened with PIXBeginNamedEvent.
PIXEndNamedEvent();
} }
@ -765,10 +755,7 @@ VOID XdkFont::DrawText( float fOriginX, float fOriginY, unsigned long dwColor,
VOID XdkFont::End() VOID XdkFont::End()
{ {
if( --m_dwNestedBeginCount > 0 ) if( --m_dwNestedBeginCount > 0 )
{
PIXEndNamedEvent();
return; return;
}
// Restore state // Restore state
if( m_bSaveState ) if( m_bSaveState )
@ -798,6 +785,4 @@ VOID XdkFont::End()
pD3dDevice->SetSamplerState( 0, D3DSAMP_ADDRESSU, m_dwSavedState[ SAVEDSTATE_D3DSAMP_ADDRESSU ] ); pD3dDevice->SetSamplerState( 0, D3DSAMP_ADDRESSU, m_dwSavedState[ SAVEDSTATE_D3DSAMP_ADDRESSU ] );
pD3dDevice->SetSamplerState( 0, D3DSAMP_ADDRESSV, m_dwSavedState[ SAVEDSTATE_D3DSAMP_ADDRESSV ] ); pD3dDevice->SetSamplerState( 0, D3DSAMP_ADDRESSV, m_dwSavedState[ SAVEDSTATE_D3DSAMP_ADDRESSV ] );
} }
PIXEndNamedEvent();
} }

3
360/xdk360_video_resources.cpp
View File

@ -160,9 +160,6 @@ HRESULT PackedResource::Create( const char * strFilename )
D3DTexture* pTexture = ( D3DTexture* )&m_pSysMemData[m_pResourceTags[i].dwOffset]; D3DTexture* pTexture = ( D3DTexture* )&m_pSysMemData[m_pResourceTags[i].dwOffset];
// Adjust Base address according to where memory was allocated // Adjust Base address according to where memory was allocated
XGOffsetBaseTextureAddress( pTexture, m_pVidMemData, m_pVidMemData ); XGOffsetBaseTextureAddress( pTexture, m_pVidMemData, m_pVidMemData );
// Let PIX know the name of the texture
PIXSetTextureName(pTexture, m_pResourceTags[i].strName);
} }
} }