| Index: ddraw/glDirectDraw.cpp |
| — | — | @@ -1492,8 +1492,8 @@ |
| 1493 | 1493 | {
|
| 1494 | 1494 | if(lpdwTotal) glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX,(GLint*)lpdwTotal);
|
| 1495 | 1495 | if(lpdwFree) glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX,(GLint*)lpdwFree);
|
| 1496 | | - if(lpdwTotal) TRACE_VAR("*lpdwTotal",8,*lpdwTotal);
|
| 1497 | | - if(lpdwFree) TRACE_VAR("*lpdwFree",8,*lpdwFree);
|
| | 1496 | + if(lpdwTotal) {TRACE_VAR("*lpdwTotal",8,*lpdwTotal);}
|
| | 1497 | + if(lpdwFree) {TRACE_VAR("*lpdwFree",8,*lpdwFree);}
|
| 1498 | 1498 | TRACE_EXIT(23,DD_OK);
|
| 1499 | 1499 | return DD_OK;
|
| 1500 | 1500 | }
|
| — | — | @@ -1503,8 +1503,8 @@ |
| 1504 | 1504 | GlobalMemoryStatus(&memstat);
|
| 1505 | 1505 | if(lpdwTotal) *lpdwTotal = memstat.dwTotalVirtual;
|
| 1506 | 1506 | if(lpdwFree) *lpdwFree = memstat.dwAvailVirtual;
|
| 1507 | | - if(lpdwTotal) TRACE_VAR("*lpdwTotal",8,*lpdwTotal);
|
| 1508 | | - if(lpdwFree) TRACE_VAR("*lpdwFree",8,*lpdwFree);
|
| | 1507 | + if(lpdwTotal) {TRACE_VAR("*lpdwTotal",8,*lpdwTotal);}
|
| | 1508 | + if(lpdwFree) {TRACE_VAR("*lpdwFree",8,*lpdwFree);}
|
| 1509 | 1509 | TRACE_EXIT(23,DD_OK);
|
| 1510 | 1510 | return DD_OK;
|
| 1511 | 1511 | }
|
| — | — | @@ -1966,8 +1966,8 @@ |
| 1967 | 1967 | {
|
| 1968 | 1968 | if(lpdwTotal) glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX,(GLint*)lpdwTotal);
|
| 1969 | 1969 | if(lpdwFree) glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX,(GLint*)lpdwFree);
|
| 1970 | | - if(lpdwTotal) TRACE_VAR("*lpdwTotal",8,*lpdwTotal);
|
| 1971 | | - if(lpdwFree) TRACE_VAR("*lpdwFree",8,*lpdwFree);
|
| | 1970 | + if(lpdwTotal) {TRACE_VAR("*lpdwTotal",8,*lpdwTotal);}
|
| | 1971 | + if(lpdwFree) {TRACE_VAR("*lpdwFree",8,*lpdwFree);}
|
| 1972 | 1972 | TRACE_EXIT(23,DD_OK);
|
| 1973 | 1973 | return DD_OK;
|
| 1974 | 1974 | }
|
| — | — | @@ -1977,8 +1977,8 @@ |
| 1978 | 1978 | GlobalMemoryStatus(&memstat);
|
| 1979 | 1979 | if(lpdwTotal) *lpdwTotal = memstat.dwTotalVirtual;
|
| 1980 | 1980 | if(lpdwFree) *lpdwFree = memstat.dwAvailVirtual;
|
| 1981 | | - if(lpdwTotal) TRACE_VAR("*lpdwTotal",8,*lpdwTotal);
|
| 1982 | | - if(lpdwFree) TRACE_VAR("*lpdwFree",8,*lpdwFree);
|
| | 1981 | + if(lpdwTotal) {TRACE_VAR("*lpdwTotal",8,*lpdwTotal);}
|
| | 1982 | + if(lpdwFree) {TRACE_VAR("*lpdwFree",8,*lpdwFree);}
|
| 1983 | 1983 | TRACE_EXIT(23,DD_OK);
|
| 1984 | 1984 | return DD_OK;
|
| 1985 | 1985 | }
|
| Index: ddraw/glDirectDrawSurface.cpp |
| — | — | @@ -228,7 +228,8 @@ |
| 229 | 229 | {
|
| 230 | 230 | ddsd.dwFlags |= DDSD_PIXELFORMAT;
|
| 231 | 231 | ddsd.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER;
|
| 232 | | - ddsd.ddpfPixelFormat.dwZBufferBitDepth = ddsd.dwRefreshRate;
|
| | 232 | + if(!ddsd.ddpfPixelFormat.dwZBufferBitDepth)
|
| | 233 | + ddsd.ddpfPixelFormat.dwZBufferBitDepth = ddsd.dwRefreshRate;
|
| 233 | 234 | switch(ddsd.ddpfPixelFormat.dwZBufferBitDepth)
|
| 234 | 235 | {
|
| 235 | 236 | case 8:
|