split directx-specific stuff out of RageUtil
This commit is contained in:
@@ -266,29 +266,8 @@ RString vssprintf( const char *fmt, va_list argList )
|
||||
# include <D3DX8Core.h>
|
||||
#else
|
||||
# include <windows.h>
|
||||
# include <dxerr8.h>
|
||||
# if defined(_MSC_VER)
|
||||
# pragma comment(lib, "dxerr8.lib")
|
||||
# endif
|
||||
#endif
|
||||
|
||||
RString hr_ssprintf( int hr, const char *fmt, ...)
|
||||
{
|
||||
va_list va;
|
||||
va_start(va, fmt);
|
||||
RString s = vssprintf( fmt, va );
|
||||
va_end(va);
|
||||
|
||||
#ifdef _XBOX
|
||||
char szError[1024] = "";
|
||||
D3DXGetErrorString( hr, szError, sizeof(szError) );
|
||||
#else
|
||||
const char *szError = DXGetErrorString8( hr );
|
||||
#endif
|
||||
|
||||
return s + ssprintf( " (%s)", szError );
|
||||
}
|
||||
|
||||
RString werr_ssprintf( int err, const char *fmt, ...)
|
||||
{
|
||||
char buf[1024] = "";
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
#include "global.h"
|
||||
#include "DirectXHelpers.h"
|
||||
#include "RageUtil.h"
|
||||
|
||||
#ifdef _XBOX
|
||||
# include <D3DX8Core.h>
|
||||
#else
|
||||
# include <windows.h>
|
||||
# include <dxerr8.h>
|
||||
# if defined(_MSC_VER)
|
||||
# pragma comment(lib, "dxerr8.lib")
|
||||
# endif
|
||||
#endif
|
||||
|
||||
RString hr_ssprintf( int hr, const char *fmt, ... )
|
||||
{
|
||||
va_list va;
|
||||
va_start(va, fmt);
|
||||
RString s = vssprintf( fmt, va );
|
||||
va_end(va);
|
||||
|
||||
#ifdef _XBOX
|
||||
char szError[1024] = "";
|
||||
D3DXGetErrorString( hr, szError, sizeof(szError) );
|
||||
#else
|
||||
const char *szError = DXGetErrorString8( hr );
|
||||
#endif
|
||||
|
||||
return s + ssprintf( " (%s)", szError );
|
||||
}
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001-2005 Chris Danford, Glenn Maynard
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
||||
* whom the Software is furnished to do so, provided that the above
|
||||
* copyright notice(s) and this permission notice appear in all copies of
|
||||
* the Software and that both the above copyright notice(s) and this
|
||||
* permission notice appear in supporting documentation.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
@@ -0,0 +1,31 @@
|
||||
#ifndef DIRECTX_HELPERS_H
|
||||
#define DIRECTX_HELPERS_H
|
||||
|
||||
RString hr_ssprintf( int hr, const char *fmt, ... );
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001-2005 Chris Danford, Glenn Maynard
|
||||
* All rights reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
||||
* whom the Software is furnished to do so, provided that the above
|
||||
* copyright notice(s) and this permission notice appear in all copies of
|
||||
* the Software and that both the above copyright notice(s) and this
|
||||
* permission notice appear in supporting documentation.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
Reference in New Issue
Block a user