Changeset 3000

Timestamp:

Mar 4, 2000, 8:37:40 PM (26 years ago)

Author:

jeroen

Message:

* empty log message *

Location:

trunk

Files:

• changelog (modified) (5 diffs)
• src/opengl/glut/glut_event.c (modified) (5 diffs)
• src/opengl/glut/glut_win.c (modified) (2 diffs)
• src/opengl/glut/glut_winmisc.c (modified) (2 diffs)
• src/opengl/glut/wgl.h (deleted)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.778 2000-03-04 19:11:15 bird Exp $ */
+ /* $Id: changelog,v 1.779 2000-03-04 19:37:40 jeroen Exp $ */
+
+ 2000-03-04: Jeroen van den Horn <J.vandenHorn@fibre.a2000.nl>
+        - GLUT32: Added logic to escape from optimizer bug in VACPP
 
  2000-03-04: knut st. osmundsen <knut.stange.osmundse@pmsc.no>
@@ -12 +15 @@
 
  2000-03-04: Sander van Leeuwen <sandervl@xs4all.nl>
-        - WSOCK32: Fixed bug in setsockopt for SO_LINGER (options size wasn't
-                   adjusted)
+        - WSOCK32: Fixed bug in setsockopt for SO_LINGER (options size wasn't
+                   adjusted)
 
  2000-03-03: Markus Montkowski <mmontkowski@gmx.de>
@@ -22 +25 @@
 
  2000-03-03: Sander van Leeuwen <sandervl@xs4all.nl>
-        - KERNEL32: Create shell dirs in odin\bin directory
+        - KERNEL32: Create shell dirs in odin\bin directory
                     Cleanup (never call Open32 apis directly if the proc
                     isn't a wrapper; include win32api.h and call Odin api)
@@ -28 +31 @@
                     Fixed bug in Win32PeLdrImage::commitPage (quake 3 screensaver's
                     fixup section doesn't start on page boundary)
-        - ADVAPI32/KERNEL32: Moved registry apis in kernel32 as we need them
+        - ADVAPI32/KERNEL32: Moved registry apis in kernel32 as we need them
                              there (importing them directly creates a circular
                              dependency (kernel32->advapi32->kernel32))
                              Should probably be moved to ntdll
-        - WINMM: Fixed typo in DartWaveOut::init to determine bits per sample
+        - WINMM: Fixed typo in DartWaveOut::init to determine bits per sample
                  (Realplayer 7 audio now works (when playing .rm files))
 
  2000-03-03: Jeroen van den Horn <J.vandenHorn@fibre.a2000.nl>
-        - KERNEL32: Fixed calling convention bug in conprop2.cpp
+        - KERNEL32: Fixed calling convention bug in conprop2.cpp
                     (caused crashes with release build)
 
  2000-03-02: Sander van Leeuwen <sandervl@xs4all.nl>
-        - OPENGL\GLIDE:         Use Odin OS/2 api wrappers in fxos2.cpp
-        - OPENGL\MESA:          Reapplied TLS fixes
+        - OPENGL\GLIDE:         Use Odin OS/2 api wrappers in fxos2.cpp
+        - OPENGL\MESA:          Reapplied TLS fixes
                                 Check for null pointer in wglSetPixelFormat
-        - OPENGL\MESA\3dfx:     Use c files from Mesa dir
+        - OPENGL\MESA\3dfx:     Use c files from Mesa dir
                                 Check for null pointer in wglSetPixelFormat
-        - WINMM: Fixed DartWaveOut::getPosition (overflow)
+        - WINMM: Fixed DartWaveOut::getPosition (overflow)
                  (fixes mp3 playback in RealPlayer 7)
-        - KERNEL32: Fixed SetCurrentDirectory (don't remove backslash
+        - KERNEL32: Fixed SetCurrentDirectory (don't remove backslash
                     if app wants to change dir to "\")
                     Create shell folders + shell keys
                     (NOTE: This has to be done in the odin install program
                            once we have one)
-        - ADVAPI32: Added crypt api stubs
+        - ADVAPI32: Added crypt api stubs
 
  2000-03-01: Jeroen van den Horn <J.vandenHorn@fibre.a2000.nl>
@@ -74 +77 @@
         - OPENGL\GLIDE\CVG\GLIDE:
                   Disable instruction scheduling in release build -> messed up
-                  colors when turned on (most likely VAC optimizer bug)
+                  colors when turned on (most likely VAC optimizer bug)
                   TODO: Somebody should also check this for the voodoo 1 glide dll.
-        - OPENGL\GLIDE\CVG:
-                  Fixed makefile
-        - OPENGL\MESA\GL\gl.h
-                  Removed circular header dependency (breaks build)
-        - OPENGL\MESA\3dfx:
+        - OPENGL\GLIDE\CVG:
+                  Fixed makefile
+        - OPENGL\MESA\GL\gl.h
+                  Removed circular header dependency (breaks build)
+        - OPENGL\MESA\3dfx:
                   Copy 3dfx opengl32.dll to bin\glide
 

trunk/src/opengl/glut/glut_event.c

@@ -1 @@
-/* $Id: glut_event.c,v 1.3 2000-03-04 19:10:14 jeroen Exp $ */
+/* $Id: glut_event.c,v 1.4 2000-03-04 19:33:43 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1997, 1998. */
 
@@ -1333 +1333 @@
   window->workMask &= ~(GLUT_DUMMY_WORK | GLUT_FINISH_WORK | GLUT_DEBUG_WORK);
 
-    WriteLog("GLUT32: processWindowWorkList -> will now return!\n");
-
   if (window->workMask) {
     /* Leave on work list. */
@@ -1348 +1346 @@
 glutMainLoop(void)
 {
-  WriteLog("GLUT32 MainLoop entered\n");
 #if !defined(_WIN32) && !defined(__WIN32OS2__)
   if (!__glutDisplay)
@@ -1357 +1354 @@
       "main loop entered with no windows created.");
   for (;;) {
-    WriteLog("GLUT32 --> LOOP in!\n");
     if (__glutWindowWorkList) {
       GLUTwindow *remainder, *work;
@@ -1377 +1373 @@
         waitForSomething();
       } else {
-    WriteLog("Calling processEventsAndTimeouts from #1403\n");
         processEventsAndTimeouts();
-    WriteLog("processEventsAndTimeouts from #1403 returned!\n");
-      }
-    }
-  }
-
-    WriteLog("MainLoop ended... ???\n");
+      }
+    }
+  }
 }
 /* ENDCENTRY */

trunk/src/opengl/glut/glut_win.c

@@ -1 @@
-/* $Id: glut_win.c,v 1.3 2000-03-04 19:10:16 jeroen Exp $ */
+/* $Id: glut_win.c,v 1.4 2000-03-04 19:33:43 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994, 1997.  */
 
@@ -1025 +1025 @@
 glutReshapeFunc(GLUTreshapeCB reshapeFunc)
 {
-  WriteLog("GLUT32: Setting reshapeFunc to @%08X\n",reshapeFunc);
   if (reshapeFunc) {
     __glutCurrentWindow->reshape = reshapeFunc;

trunk/src/opengl/glut/glut_winmisc.c

@@ -1 @@
-/* $Id: glut_winmisc.c,v 1.3 2000-03-04 19:10:16 jeroen Exp $ */
+/* $Id: glut_winmisc.c,v 1.4 2000-03-04 19:33:43 jeroen Exp $ */
 /* Copyright (c) Mark J. Kilgard, 1994.  */
 
@@ -66 +66 @@
 glutReshapeWindow(int w, int h)
 {
-  WriteLog("glutReshapeWindow (glut_winmisc)\n");
   IGNORE_IN_GAME_MODE();
   if (w <= 0 || h <= 0)