eukara
/
fteqw
forked from fte/fteqw
1
0
Fork 0
Code Pull Requests Activity

vid_displayfrequency works on fullscreen ddraw modes. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@941 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-04-02 21:25:28 +00:00
parent 17268522f7
commit 8c1ff58f14
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/sw/vid_ddraw.c
View File

@ -5,7 +5,7 @@ qboolean vid_palettized;
#ifndef NODIRECTX #ifndef NODIRECTX
HMODULE hinstDDRAW; HMODULE hinstDDRAW;
LPDIRECTDRAW lpDirectDraw; LPDIRECTDRAW2 lpDirectDraw;
LPDIRECTDRAWSURFACE lpddsFrontBuffer, lpddsBackBuffer, lpddsOffScreenBuffer; LPDIRECTDRAWSURFACE lpddsFrontBuffer, lpddsBackBuffer, lpddsOffScreenBuffer;
LPDIRECTDRAWPALETTE lpddpPalette; LPDIRECTDRAWPALETTE lpddpPalette;
extern qbyte vid_curpal[]; extern qbyte vid_curpal[];
@ -141,7 +141,7 @@ qboolean DDRAW_Init(rendererstate_t *info, unsigned char **ppbuffer, int *ppitch
DDSCAPS ddscaps; DDSCAPS ddscaps;
HRESULT ddrval; HRESULT ddrval;
HRESULT (WINAPI *QDirectDrawCreate)( GUID FAR *lpGUID, LPDIRECTDRAW FAR * lplpDDRAW, IUnknown FAR * pUnkOuter ); HRESULT (WINAPI *QDirectDrawCreateEx)( GUID FAR *lpGUID, LPVOID *lplpDD, REFIID iid, IUnknown FAR * pUnkOuter );
hinstDDRAW = LoadLibrary( "ddraw.dll" ); hinstDDRAW = LoadLibrary( "ddraw.dll" );
if (!hinstDDRAW) if (!hinstDDRAW)
@ -150,13 +150,13 @@ qboolean DDRAW_Init(rendererstate_t *info, unsigned char **ppbuffer, int *ppitch
goto fail; goto fail;
} }
if ( ( QDirectDrawCreate = ( HRESULT (WINAPI *)( GUID FAR *, LPDIRECTDRAW FAR *, IUnknown FAR * ) ) GetProcAddress( hinstDDRAW, "DirectDrawCreate" ) ) == NULL ) if ( ( QDirectDrawCreateEx = ( HRESULT (WINAPI *)( GUID FAR *, LPVOID *, REFIID, IUnknown FAR * ) ) GetProcAddress( hinstDDRAW, "DirectDrawCreateEx" ) ) == NULL )
{ {
Con_Printf( "*** DirectDrawCreate == NULL ***\n" ); Con_Printf( "*** DirectDrawCreate == NULL ***\n" );
goto fail; goto fail;
} }
if ( ( ddrval = QDirectDrawCreate( NULL, &lpDirectDraw, NULL ) ) != DD_OK ) if ( ( ddrval = QDirectDrawCreateEx( NULL, &lpDirectDraw, &IID_IDirectDraw2, NULL ) ) != DD_OK )
{ {
Con_Printf( "failed - %s\n", DDrawError( ddrval ) ); Con_Printf( "failed - %s\n", DDrawError( ddrval ) );
goto fail; goto fail;
@ -184,7 +184,7 @@ qboolean DDRAW_Init(rendererstate_t *info, unsigned char **ppbuffer, int *ppitch
Con_SafePrintf( "...finding display mode\n" ); Con_SafePrintf( "...finding display mode\n" );
Con_SafePrintf( "...setting linear mode: " ); Con_SafePrintf( "...setting linear mode: " );
if ( ( ddrval = lpDirectDraw->lpVtbl->SetDisplayMode( lpDirectDraw, vid.width, vid.height, r_pixbytes*8 ) ) == DD_OK ) if ( ( ddrval = lpDirectDraw->lpVtbl->SetDisplayMode( lpDirectDraw, vid.width, vid.height, r_pixbytes*8, info->rate, 0 ) ) == DD_OK )
{ {
Con_SafePrintf( "ok\n" ); Con_SafePrintf( "ok\n" );
} }
@ -217,7 +217,7 @@ qboolean DDRAW_Init(rendererstate_t *info, unsigned char **ppbuffer, int *ppitch
/* /*
** change our display mode ** change our display mode
*/ */
if ( ( ddrval = lpDirectDraw->lpVtbl->SetDisplayMode( lpDirectDraw, vid.width, vid.height, r_pixbytes*8 ) ) != DD_OK ) if ( ( ddrval = lpDirectDraw->lpVtbl->SetDisplayMode( lpDirectDraw, vid.width, vid.height, r_pixbytes*8, info->rate, 0 ) ) != DD_OK )
{ {
Con_SafePrintf( "failed SDM - %s\n", DDrawError( ddrval ) ); Con_SafePrintf( "failed SDM - %s\n", DDrawError( ddrval ) );
goto fail; goto fail;