summaryrefslogtreecommitdiff
path: root/sample/d3d11/sample_d3d11.cpp
diff options
context:
space:
mode:
authorJason Maskell <[email protected]>2016-05-31 13:54:29 +0200
committerJason Maskell <[email protected]>2016-05-31 13:54:29 +0200
commit9d4bad02e6eb15ec5cf62681923543776d66e9f1 (patch)
tree1f64f36d04a518a1369ce9e34ba30b0debea1b9f /sample/d3d11/sample_d3d11.cpp
parentAdded support for RFC 104, the logging interface: https://docs.google.com/doc... (diff)
downloadwaveworks_archive-9d4bad02e6eb15ec5cf62681923543776d66e9f1.tar.xz
waveworks_archive-9d4bad02e6eb15ec5cf62681923543776d66e9f1.zip
Renamed Logger.h to GFSDK_Logger.h since it's a shared header.
Removed the narrow char methods. Removed the floating log functions. Changed the ILogger::log() method to use varargs and printf() formatting.
Diffstat (limited to 'sample/d3d11/sample_d3d11.cpp')
-rw-r--r--sample/d3d11/sample_d3d11.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/sample/d3d11/sample_d3d11.cpp b/sample/d3d11/sample_d3d11.cpp
index 929ba11..6383777 100644
--- a/sample/d3d11/sample_d3d11.cpp
+++ b/sample/d3d11/sample_d3d11.cpp
@@ -46,7 +46,7 @@
#include <locale>
#include <codecvt>
#include <xlocbuf>
-#include "../common/Logger.h"
+#include "GFSDK_Logger.h"
#include "../common/LoggerImpl.h"
//#define DEBUG_VS // Uncomment this line to debug vertex shaders
@@ -209,11 +209,11 @@ INT WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR cmdline, int )
_CrtSetDbgFlag( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
#endif
- NV_LOG("Testing!");
+ NV_LOG(L"Testing!");
- GFSDK_WaveWorks_SetUserLogger(static_cast<nv::ILogger*>(g_Logger));
+ GFSDK_WaveWorks_SetUserLogger(static_cast<nv::ILogger*>(LoggerWWSamples::GetInstance()));
- NV_LOG("User logger set!");
+ NV_LOG(L"User logger set!");
//TODO: Take from cmdline
auto mediaPath = "..\\..\\media\\sample";