diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-04-03 05:28:43 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-04-03 05:28:43 +0400 |
| commit | 36f498aae062e6f0a04de22ac6054b988dde7a32 (patch) | |
| tree | bf5b6dcdb0b69482ef4bd6888a1533470a9b7300 | |
| parent | d537ce9b25915231c1ff1aeddfa4456b2be8bcab (diff) | |
made some gfx debug code win32 specific
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_ghost.cpp | 6 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/BL_Shader.cpp | 9 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 79a5171eec5..2affdfeae18 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -333,9 +333,11 @@ int main(int argc, char** argv) GEN_init_messaging_system(); // Parse command line options +#ifdef WIN32 #ifndef NDEBUG printf("argv[0] = '%s'\n", argv[0]); #endif +#endif //WIN32 #ifdef WIN32 @@ -367,9 +369,11 @@ int main(int argc, char** argv) ;) { +#ifdef WIN32 #ifndef NDEBUG printf("argv[%d] = '%s' , %i\n", i, argv[i],argc); #endif +#endif //WIN32 if (argv[i][0] == '-') { switch (argv[i][1]) @@ -392,9 +396,11 @@ int main(int argc, char** argv) SYS_WriteCommandLineInt(syshandle, paramname, atoi(argv[i])); SYS_WriteCommandLineFloat(syshandle, paramname, atof(argv[i])); SYS_WriteCommandLineString(syshandle, paramname, argv[i]); +#ifdef WIN32 #ifndef NDEBUG printf("%s = '%s'\n", paramname, argv[i]); #endif +#endif //WIN32 i++; } else diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp index 08bec1411f5..5598224c1ea 100644 --- a/source/gameengine/Ketsji/BL_Shader.cpp +++ b/source/gameengine/Ketsji/BL_Shader.cpp @@ -214,12 +214,14 @@ BL_Uniform *BL_Shader::FindUniform(const int location) void BL_Shader::SetUniformfv(int location, int type, float *param,int size, bool transpose) { #ifdef SORT_UNIFORMS +#ifdef WIN32 #ifndef NDEBUG MT_assert(type > BL_Uniform::UNI_NONE && type < BL_Uniform::UNI_MAX); MT_assert(location); MT_assert(param); - //MT_assert(size > 0 && size <= BL_Uniform::UNIFORM_MAX_LEN); + //MT_assert(size > 0 && size <= UNIFORM_MAX_LEN); #endif +#endif //WIN32 BL_Uniform *uni= FindUniform(location); if(uni) { @@ -240,12 +242,15 @@ void BL_Shader::SetUniformfv(int location, int type, float *param,int size, bool void BL_Shader::SetUniformiv(int location, int type, int *param,int size, bool transpose) { #ifdef SORT_UNIFORMS +#ifdef WIN32 #ifndef NDEBUG - //MT_assert(type > UNI_NONE && type < UNI_MAX); + //MT_assert(type > BL_Uniform::UNI_NONE && type < BL_Uniform::UNI_MAX); MT_assert(location); MT_assert(param); //MT_assert(size > 0 && size <= UNIFORM_MAX_LEN); #endif +#endif //WIN32 + BL_Uniform *uni= FindUniform(location); if(uni) { diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp index 5f0541f8bac..29736ee4cfc 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp @@ -18,7 +18,9 @@ #include "MT_assert.h" #ifndef NDEBUG +#ifdef WIN32 #define spit(x) std::cout << x << std::endl; +#endif //WIN32 #else #define spit(x) #endif |