[Scummvm-cvs-logs] SF.net SVN: scummvm:[34667] residual/trunk

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Sun Sep 28 17:43:25 CEST 2008


Revision: 34667
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34667&view=rev
Author:   aquadran
Date:     2008-09-28 15:43:24 +0000 (Sun, 28 Sep 2008)

Log Message:
-----------
replace tinygl msghandling code with warning()

Modified Paths:
--------------
    residual/trunk/dists/msvc7/residual.vcproj
    residual/trunk/dists/msvc71/residual.vcproj
    residual/trunk/dists/msvc8/residual.vcproj
    residual/trunk/dists/msvc9/residual.vcproj
    residual/trunk/dists/xcode/residual.xcodeproj/project.pbxproj
    residual/trunk/engine/tinygl/misc.cpp
    residual/trunk/engine/tinygl/module.mk
    residual/trunk/engine/tinygl/specbuf.cpp
    residual/trunk/engine/tinygl/zgl.h

Removed Paths:
-------------
    residual/trunk/engine/tinygl/msghandling.cpp
    residual/trunk/engine/tinygl/msghandling.h

Modified: residual/trunk/dists/msvc7/residual.vcproj
===================================================================
--- residual/trunk/dists/msvc7/residual.vcproj	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/dists/msvc7/residual.vcproj	2008-09-28 15:43:24 UTC (rev 34667)
@@ -588,12 +588,6 @@
 					RelativePath="..\..\engine\tinygl\misc.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engine\tinygl\msghandling.cpp">
-				</File>
-				<File
-					RelativePath="..\..\engine\tinygl\msghandling.h">
-				</File>
-				<File
 					RelativePath="..\..\engine\tinygl\opinfo.h">
 				</File>
 				<File

Modified: residual/trunk/dists/msvc71/residual.vcproj
===================================================================
--- residual/trunk/dists/msvc71/residual.vcproj	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/dists/msvc71/residual.vcproj	2008-09-28 15:43:24 UTC (rev 34667)
@@ -602,12 +602,6 @@
 					RelativePath="..\..\engine\tinygl\misc.cpp">
 				</File>
 				<File
-					RelativePath="..\..\engine\tinygl\msghandling.cpp">
-				</File>
-				<File
-					RelativePath="..\..\engine\tinygl\msghandling.h">
-				</File>
-				<File
 					RelativePath="..\..\engine\tinygl\opinfo.h">
 				</File>
 				<File

Modified: residual/trunk/dists/msvc8/residual.vcproj
===================================================================
--- residual/trunk/dists/msvc8/residual.vcproj	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/dists/msvc8/residual.vcproj	2008-09-28 15:43:24 UTC (rev 34667)
@@ -823,14 +823,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\engine\tinygl\msghandling.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\engine\tinygl\msghandling.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\engine\tinygl\opinfo.h"
 					>
 				</File>

Modified: residual/trunk/dists/msvc9/residual.vcproj
===================================================================
--- residual/trunk/dists/msvc9/residual.vcproj	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/dists/msvc9/residual.vcproj	2008-09-28 15:43:24 UTC (rev 34667)
@@ -828,14 +828,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\engine\tinygl\msghandling.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\engine\tinygl\msghandling.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\engine\tinygl\opinfo.h"
 					>
 				</File>

Modified: residual/trunk/dists/xcode/residual.xcodeproj/project.pbxproj
===================================================================
--- residual/trunk/dists/xcode/residual.xcodeproj/project.pbxproj	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/dists/xcode/residual.xcodeproj/project.pbxproj	2008-09-28 15:43:24 UTC (rev 34667)
@@ -93,7 +93,6 @@
 		289EEF230D8921F600521A80 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 289EEEBF0D8921F600521A80 /* matrix.cpp */; };
 		289EEF240D8921F600521A80 /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 289EEEC00D8921F600521A80 /* memory.cpp */; };
 		289EEF250D8921F600521A80 /* misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 289EEEC10D8921F600521A80 /* misc.cpp */; };
-		289EEF260D8921F600521A80 /* msghandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 289EEEC20D8921F600521A80 /* msghandling.cpp */; };
 		289EEF270D8921F600521A80 /* select.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 289EEEC60D8921F600521A80 /* select.cpp */; };
 		289EEF280D8921F600521A80 /* specbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 289EEEC70D8921F600521A80 /* specbuf.cpp */; };
 		289EEF290D8921F600521A80 /* texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 289EEEC90D8921F600521A80 /* texture.cpp */; };
@@ -303,8 +302,6 @@
 		289EEEBF0D8921F600521A80 /* matrix.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = matrix.cpp; sourceTree = "<group>"; };
 		289EEEC00D8921F600521A80 /* memory.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = memory.cpp; sourceTree = "<group>"; };
 		289EEEC10D8921F600521A80 /* misc.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = misc.cpp; sourceTree = "<group>"; };
-		289EEEC20D8921F600521A80 /* msghandling.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = msghandling.cpp; sourceTree = "<group>"; };
-		289EEEC30D8921F600521A80 /* msghandling.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = msghandling.h; sourceTree = "<group>"; };
 		289EEEC40D8921F600521A80 /* opinfo.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = opinfo.h; sourceTree = "<group>"; };
 		289EEEC50D8921F600521A80 /* README.residual */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = README.residual; sourceTree = "<group>"; };
 		289EEEC60D8921F600521A80 /* select.cpp */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.cpp.cpp; path = select.cpp; sourceTree = "<group>"; };
@@ -681,8 +678,6 @@
 				289EEEBF0D8921F600521A80 /* matrix.cpp */,
 				289EEEC00D8921F600521A80 /* memory.cpp */,
 				289EEEC10D8921F600521A80 /* misc.cpp */,
-				289EEEC20D8921F600521A80 /* msghandling.cpp */,
-				289EEEC30D8921F600521A80 /* msghandling.h */,
 				289EEEC40D8921F600521A80 /* opinfo.h */,
 				289EEEC50D8921F600521A80 /* README.residual */,
 				289EEEC60D8921F600521A80 /* select.cpp */,
@@ -875,7 +870,6 @@
 				289EEF230D8921F600521A80 /* matrix.cpp in Sources */,
 				289EEF240D8921F600521A80 /* memory.cpp in Sources */,
 				289EEF250D8921F600521A80 /* misc.cpp in Sources */,
-				289EEF260D8921F600521A80 /* msghandling.cpp in Sources */,
 				289EEF270D8921F600521A80 /* select.cpp in Sources */,
 				289EEF280D8921F600521A80 /* specbuf.cpp in Sources */,
 				289EEF290D8921F600521A80 /* texture.cpp in Sources */,

Modified: residual/trunk/engine/tinygl/misc.cpp
===================================================================
--- residual/trunk/engine/tinygl/misc.cpp	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/engine/tinygl/misc.cpp	2008-09-28 15:43:24 UTC (rev 34667)
@@ -28,7 +28,6 @@
 			gl_fatal_error("glViewport: size too small");
 		}
 
-		tgl_trace("glViewport: %d %d %d %d", xmin, ymin, xsize, ysize);
 		c->viewport.xmin = xmin;
 		c->viewport.ymin = ymin;
 		c->viewport.xsize = xsize;

Modified: residual/trunk/engine/tinygl/module.mk
===================================================================
--- residual/trunk/engine/tinygl/module.mk	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/engine/tinygl/module.mk	2008-09-28 15:43:24 UTC (rev 34667)
@@ -14,7 +14,6 @@
 	matrix.o \
 	memory.o \
 	misc.o \
-	msghandling.o \
 	select.o \
 	specbuf.o \
 	texture.o \

Deleted: residual/trunk/engine/tinygl/msghandling.cpp
===================================================================
--- residual/trunk/engine/tinygl/msghandling.cpp	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/engine/tinygl/msghandling.cpp	2008-09-28 15:43:24 UTC (rev 34667)
@@ -1,51 +0,0 @@
-
-#include "engine/tinygl/zgl.h"
-
-#ifndef TINYGL_DEBUG
-//#define TINYGL_DEBUG
-#endif
-
-// Use this function to output messages when something unexpected
-// happens (which might be an indication of an error). *Don't* use it
-// when there's internal errors in the code - these should be handled
-// by asserts.
-#ifndef TINYGL_DEBUG
-void tgl_warning(const char *, ...) { }
-#else
-void tgl_warning(const char *format, ...) {
-	va_list args;
-	va_start(args, format);
-	fprintf(stderr, "*WARNING* ");
-	vfprintf(stderr, format, args);
-	va_end(args);
-}
-#endif
-
-// This function should be used for debug output only.
-#ifndef TINYGL_DEBUG
-void tgl_trace(const char *, ...) { }
-#else
-void tgl_trace(const char *format, ...) {
-	va_list args;
-	va_start(args, format);
-	fprintf(stderr, "*DEBUG* ");
-	vfprintf(stderr, format, args);
-	va_end(args);
-}
-#endif
-
-// Use this function to output info about things in the code which
-// should be fixed (missing handling of special cases, important
-// features not implemented, known bugs/buglets, ...).
-#ifndef TINYGL_DEBUG
-void tgl_fixme(const char *, ...) { }
-#else
-void tgl_fixme(const char *format, ...) {
-	va_list args;
-	va_start(args, format);
-	fprintf(stderr, "*FIXME* ");
-	vfprintf(stderr, format, args);
-	va_end(args);
-}
-#endif
-

Deleted: residual/trunk/engine/tinygl/msghandling.h
===================================================================
--- residual/trunk/engine/tinygl/msghandling.h	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/engine/tinygl/msghandling.h	2008-09-28 15:43:24 UTC (rev 34667)
@@ -1,8 +0,0 @@
-#ifndef _msghandling_h_
-#define _msghandling_h_
-
-extern void tgl_warning(const char *text, ...);
-extern void tgl_trace(const char *text, ...);
-extern void tgl_fixme(const char *text, ...);
-
-#endif // _msghandling_h_

Modified: residual/trunk/engine/tinygl/specbuf.cpp
===================================================================
--- residual/trunk/engine/tinygl/specbuf.cpp	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/engine/tinygl/specbuf.cpp	2008-09-28 15:43:24 UTC (rev 34667)
@@ -40,7 +40,6 @@
 		return buf;     
 	}
 	//overwrite the lru buffer
-	//tgl_trace("overwriting spec buffer :(");
 	oldest->shininess_i = shininess_i;
 	oldest->last_used = c->specbuf_used_counter++;
 	calc_buf(oldest, shininess);

Modified: residual/trunk/engine/tinygl/zgl.h
===================================================================
--- residual/trunk/engine/tinygl/zgl.h	2008-09-28 15:35:14 UTC (rev 34666)
+++ residual/trunk/engine/tinygl/zgl.h	2008-09-28 15:43:24 UTC (rev 34667)
@@ -1,10 +1,7 @@
 #ifndef _tgl_zgl_h_
 #define _tgl_zgl_h_
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <assert.h>
+#include "common/debug.h"
 
 #include "engine/tinygl/gl.h"
 #include "engine/tinygl/zbuffer.h"
@@ -14,7 +11,7 @@
 
 #define ADD_OP(a,b,c) OP_ ## a ,
 
-#include "opinfo.h"
+#include "engine/tinygl/opinfo.h"
 
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list