Make pixel format querying a member (massaging for merge).

Remove a function from the header.
This commit is contained in:
Glenn Maynard
2003-05-26 03:12:12 +00:00
parent 35405bc34c
commit 56b79a197d
6 changed files with 41 additions and 24 deletions
+8 -1
View File
@@ -122,7 +122,7 @@ static void SetPalette( unsigned TexResource )
#define D3DFVF_RAGEVERTEX (D3DFVF_XYZ|D3DFVF_NORMAL|D3DFVF_DIFFUSE|D3DFVF_TEX1) // D3D FVF flags which describe our vertex structure
const PixelFormatDesc PIXEL_FORMAT_DESC[NUM_PIX_FORMATS] = {
static const PixelFormatDesc PIXEL_FORMAT_DESC[NUM_PIX_FORMATS] = {
{
/* A8B8G8R8 */
32,
@@ -165,6 +165,13 @@ const PixelFormatDesc PIXEL_FORMAT_DESC[NUM_PIX_FORMATS] = {
}
};
const PixelFormatDesc *RageDisplay::GetPixelFormatDesc(PixelFormat pf) const
{
ASSERT( pf < NUM_PIX_FORMATS );
return &PIXEL_FORMAT_DESC[pf];
}
RageDisplay::RageDisplay( bool windowed, int width, int height, int bpp, int rate, bool vsync, CString sWindowTitle, CString sIconFile )
{