changed an output message. Right now it supports dx9.0a. I left room for 9.0b, coming up

This commit is contained in:
Asad M. Zaman 2004-01-29 23:15:03 +00:00
parent 67a4e0c56d
commit 587c64366c
2 changed files with 3 additions and 3 deletions

View File

@ -3405,7 +3405,7 @@ copy_pixel_buffer(PixelBuffer *pb, const DisplayRegion *dr) {
SrcCopyRect.bottom=TmpSurfYsize; SrcCopyRect.bottom=TmpSurfYsize;
} }
hr=_pD3DDevice->CreateOffscreenPlainSurface(TmpSurfXsize,TmpSurfYsize,D3DFMT_A8R8G8B8,D3DPOOL_SYSTEMMEM, &pD3DSurf, NULL); hr=_pD3DDevice->CreateOffscreenPlainSurface(TmpSurfXsize,TmpSurfYsize,D3DFMT_A8R8G8B8,D3DPOOL_MANAGED, &pD3DSurf, NULL);
if(FAILED(hr)) { if(FAILED(hr)) {
dxgsg9_cat.error() << "CreateImageSurface failed in copy_pixel_buffer()" << D3DERRORSTRING(hr); dxgsg9_cat.error() << "CreateImageSurface failed in copy_pixel_buffer()" << D3DERRORSTRING(hr);
exit(1); exit(1);
@ -5197,7 +5197,7 @@ HRESULT CreateDX9Cursor(LPDIRECT3DDEVICE9 pd3dDevice, HCURSOR hCursor,BOOL bAddW
// Create a surface for the cursor // Create a surface for the cursor
if( FAILED( hr = pd3dDevice->CreateOffscreenPlainSurface( dwWidth, dwHeightDest, if( FAILED( hr = pd3dDevice->CreateOffscreenPlainSurface( dwWidth, dwHeightDest,
D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &pCursorBitmap, NULL ) ) ) { D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &pCursorBitmap, NULL ) ) ) {
goto End; goto End;
} }

View File

@ -911,7 +911,7 @@ choose_device(void) {
LARGE_INTEGER *DrvVer = &adapter_info.DriverVersion; LARGE_INTEGER *DrvVer = &adapter_info.DriverVersion;
wdxdisplay9_cat.info() wdxdisplay9_cat.info()
<< "D3D9." << (dxpipe->_bIsDX9 ?"1":"0") << " Adapter[" << i << "]: " << adapter_info.Description << "D3D9." << (dxpipe->_bIsDX9 ?"a":"b") << " Adapter[" << i << "]: " << adapter_info.Description
<< ", Driver: " << adapter_info.Driver << ", DriverVersion: (" << ", Driver: " << adapter_info.Driver << ", DriverVersion: ("
<< HIWORD(DrvVer->HighPart) << "." << LOWORD(DrvVer->HighPart) << "." << HIWORD(DrvVer->HighPart) << "." << LOWORD(DrvVer->HighPart) << "."
<< HIWORD(DrvVer->LowPart) << "." << LOWORD(DrvVer->LowPart) << HIWORD(DrvVer->LowPart) << "." << LOWORD(DrvVer->LowPart)