From ad88b27c7625b1577dd0c5cc656f3cbb73e6aac9 Mon Sep 17 00:00:00 2001 From: nakeee Date: Wed, 4 Feb 2009 17:29:12 +0000 Subject: [PATCH] attempt to get rid of another __LOG crash git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2110 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/VertexLoader_Position.cpp | 2 -- Source/Core/VideoCommon/Src/VideoCommon.h | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp index 4dfd1c1869..2a9d4bcb09 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader_Position.cpp @@ -27,8 +27,6 @@ extern float posScale; extern TVtxAttr *pVtxAttr; -#define LOG_VTX() PRIM_LOG("vtx: %f %f %f, ", ((float*)VertexManager::s_pCurBufferPointer)[0], ((float*)VertexManager::s_pCurBufferPointer)[1], ((float*)VertexManager::s_pCurBufferPointer)[2]); - // Thoughts on the implementation of a vertex loader compiler. // s_pCurBufferPointer should definitely be in a register. // Could load the position scale factor in XMM7, for example. diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h index a404e06cce..405f3d9416 100644 --- a/Source/Core/VideoCommon/Src/VideoCommon.h +++ b/Source/Core/VideoCommon/Src/VideoCommon.h @@ -92,11 +92,18 @@ struct TRectangle void DebugLog(const char* _fmt, ...); // This one goes to the main program void HandleGLError(); +#ifdef LOGGING +#define LOG_VTX() LOG("vtx: %f %f %f, ", ((float*)VertexManager::s_pCurBufferPointer)[0], ((float*)VertexManager::s_pCurBufferPointer)[1], ((float*)VertexManager::s_pCurBufferPointer)[2]); +#else +#define LOG_VTX() +#endif + #ifdef _WIN32 #define ERROR_LOG(...) LOG(VIDEO, __VA_ARGS__) #define INFO_LOG(...) LOG(VIDEO, __VA_ARGS__) #define PRIM_LOG(...) LOG(VIDEO, __VA_ARGS__) #define DEBUG_LOG(...) LOG(VIDEO, __VA_ARGS__) + #else #define ERROR_LOG(...) LOG(VIDEO, ##__VA_ARGS__) #define INFO_LOG(...) LOG(VIDEO, ##__VA_ARGS__)