diff options
| author | Keith Whitwell <[email protected]> | 2009-02-10 19:22:57 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-02-10 19:22:57 +0000 |
| commit | 9c9ba66fbae8089e9423f6b09ad1091cccf9b006 (patch) | |
| tree | 81ecce3d6b19e5b77fcf31e5f081e1c546f398b9 /src/gallium/state_trackers/wgl/icd | |
| parent | ebb864da9e98003be9ea388013ae4385d341e46f (diff) | |
| parent | 1e8177ee178b131afa86d874b062a8ae3fae0cca (diff) | |
Merge commit 'origin/gallium-0.2' into gallium-0.2
Conflicts:
src/gallium/state_trackers/wgl/icd/stw_icd.c
Diffstat (limited to 'src/gallium/state_trackers/wgl/icd')
| -rw-r--r-- | src/gallium/state_trackers/wgl/icd/stw_icd.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/wgl/icd/stw_icd.c b/src/gallium/state_trackers/wgl/icd/stw_icd.c index 2cefc5c812c..e4f3c669e20 100644 --- a/src/gallium/state_trackers/wgl/icd/stw_icd.c +++ b/src/gallium/state_trackers/wgl/icd/stw_icd.c @@ -101,6 +101,9 @@ lookup_context( struct stw_icd *icd, dhglrc >= DRV_CONTEXT_MAX) return NULL; + if (icd == NULL) + return NULL; + return icd->ctx_array[dhglrc - 1].ctx; } @@ -221,7 +224,7 @@ DrvDescribePixelFormat( r = stw_pixelformat_describe( hdc, iPixelFormat, cjpfd, ppfd ); - debug_printf( "%s( 0x%p, %d, %u, 0x%p ) = %d\n", + debug_printf( "%s( %p, %d, %u, %p ) = %d\n", __FUNCTION__, hdc, iPixelFormat, cjpfd, ppfd, r ); return r; @@ -248,7 +251,7 @@ DrvGetProcAddress( r = stw_get_proc_address( lpszProc ); - debug_printf( "%s( \", __FUNCTION__%s\" ) = 0x%p\n", lpszProc, r ); + debug_printf( "%s( \", __FUNCTION__%s\" ) = %p\n", lpszProc, r ); return r; } @@ -298,7 +301,7 @@ DrvSetCallbackProcs( INT nProcs, PROC *pProcs ) { - debug_printf( "%s( %d, 0x%p )\n", __FUNCTION__, nProcs, pProcs ); + debug_printf( "%s( %d, %p )\n", __FUNCTION__, nProcs, pProcs ); return; } @@ -709,7 +712,7 @@ DrvSetPixelFormat( r = stw_pixelformat_set( hdc, iPixelFormat ); - debug_printf( "%s( 0x%p, %d ) = %s\n", __FUNCTION__, hdc, iPixelFormat, r ? "TRUE" : "FALSE" ); + debug_printf( "%s( %p, %d ) = %s\n", __FUNCTION__, hdc, iPixelFormat, r ? "TRUE" : "FALSE" ); return r; } @@ -728,7 +731,7 @@ BOOL APIENTRY DrvSwapBuffers( HDC hdc ) { - debug_printf( "%s( 0x%p )\n", __FUNCTION__, hdc ); + debug_printf( "%s( %p )\n", __FUNCTION__, hdc ); return stw_swap_buffers( hdc ); } @@ -749,5 +752,7 @@ DrvValidateVersion( { debug_printf( "%s( %u )\n", __FUNCTION__, ulVersion ); + /* TODO: get the expected version from the winsys */ + return ulVersion == 1; } |