DXGL r364 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:< r363‎ | r364 | r365 >
Date:01:09, 28 March 2013
Author:admin
Status:new
Tags:
Comment:
Finish fixing GetAvailableVidMem in trace build.
Modified paths:
  • /ddraw/glDirectDraw.cpp (modified) (history)

Diff [purge]

Index: ddraw/glDirectDraw.cpp
——@@ -1503,8 +1503,8 @@
15041504 GlobalMemoryStatus(&memstat);
15051505 if(lpdwTotal) *lpdwTotal = memstat.dwTotalVirtual;
15061506 if(lpdwFree) *lpdwFree = memstat.dwAvailVirtual;
1507 - TRACE_VAR("*lpdwTotal",8,*lpdwTotal);
1508 - TRACE_VAR("*lpdwFree",8,*lpdwFree);
 1507+ if(lpdwTotal) TRACE_VAR("*lpdwTotal",8,*lpdwTotal);
 1508+ if(lpdwFree) TRACE_VAR("*lpdwFree",8,*lpdwFree);
15091509 TRACE_EXIT(23,DD_OK);
15101510 return DD_OK;
15111511 }
——@@ -1966,8 +1966,8 @@
19671967 {
19681968 if(lpdwTotal) glGetIntegerv(GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX,(GLint*)lpdwTotal);
19691969 if(lpdwFree) glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX,(GLint*)lpdwFree);
1970 - TRACE_VAR("*lpdwTotal",8,*lpdwTotal);
1971 - TRACE_VAR("*lpdwFree",8,*lpdwFree);
 1970+ if(lpdwTotal) TRACE_VAR("*lpdwTotal",8,*lpdwTotal);
 1971+ if(lpdwFree) TRACE_VAR("*lpdwFree",8,*lpdwFree);
19721972 TRACE_EXIT(23,DD_OK);
19731973 return DD_OK;
19741974 }
——@@ -1977,8 +1977,8 @@
19781978 GlobalMemoryStatus(&memstat);
19791979 if(lpdwTotal) *lpdwTotal = memstat.dwTotalVirtual;
19801980 if(lpdwFree) *lpdwFree = memstat.dwAvailVirtual;
1981 - TRACE_VAR("*lpdwTotal",8,*lpdwTotal);
1982 - TRACE_VAR("*lpdwFree",8,*lpdwFree);
 1981+ if(lpdwTotal) TRACE_VAR("*lpdwTotal",8,*lpdwTotal);
 1982+ if(lpdwFree) TRACE_VAR("*lpdwFree",8,*lpdwFree);
19831983 TRACE_EXIT(23,DD_OK);
19841984 return DD_OK;
19851985 }
Retrieved from "https://dxgl.org/wiki/Special:Code/DXGL/364"