[Squeak-Commits] squeak/platforms/win32/vm sqWin32.h,1.3,1.4 sqWin32Exports.c,1.1,1.2 sqWin32Prefs.c,1.3,1.4 sqWin32Prefs.h,1.2,1.3 sqWin32Window.c,1.5,1.6

[Andreas R. <and...@us...>]

Update of /cvsroot/squeak/squeak/platforms/win32/vm
In directory usw-pr-cvs1:/tmp/cvs-serv21185/vm

Modified Files:
	sqWin32.h sqWin32Exports.c sqWin32Prefs.c sqWin32Prefs.h 
	sqWin32Window.c 
Log Message:
unified D3D and OpenGL support

Index: sqWin32.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqWin32.h	4 May 2002 23:20:28 -0000	1.3
--- sqWin32.h	6 May 2002 10:36:25 -0000	1.4
***************
*** 284,287 ****
--- 284,288 ----
  extern DWORD dwMemorySize;   /* How much memory do we use? */
  extern BOOL  fUseDirectSound;/* Do we use DirectSound?! */
+ extern BOOL  fUseOpenGL;     /* Do we use OpenGL?! */
  extern BOOL fReduceCPUUsage; /* Should we reduce CPU usage? */
  extern BOOL fReduceCPUInBackground; /* reduce CPU usage when not active? */

Index: sqWin32Exports.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Exports.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sqWin32Exports.c	4 May 2002 23:20:28 -0000	1.1
--- sqWin32Exports.c	6 May 2002 10:36:25 -0000	1.2
***************
*** 16,19 ****
--- 16,20 ----
  extern void* firstMessageHook;
  extern void* preMessageHook;
+ extern int fUseOpenGL;
  
  void *os_exports[][3] = {
***************
*** 32,35 ****
--- 33,38 ----
    {"","firstMessageHook", &firstMessageHook},
    {"","preMessageHook", &preMessageHook},
+   {"","fUseOpenGL", &fUseOpenGL},
    {NULL,NULL, NULL}
  };
+ 

Index: sqWin32Prefs.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Prefs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqWin32Prefs.c	4 May 2002 23:20:28 -0000	1.3
--- sqWin32Prefs.c	6 May 2002 10:36:25 -0000	1.4
***************
*** 121,124 ****
--- 121,131 ----
  }
  
+ void SetB3DXUsesOpenGL() {
+   CheckMenuItem(vmPrefsMenu, ID_USEOPENGL, MF_BYCOMMAND | 
+ 		(fUseOpenGL ? MF_CHECKED : MF_UNCHECKED));
+   WritePrivateProfileString(U_GLOBAL,TEXT("B3DXUsesOpenGL"),
+ 			    fUseOpenGL ? U_ON : U_OFF,squeakIniName);
+ }
+ 
  
  void LoadPreferences()
***************
*** 151,154 ****
--- 158,165 ----
      GetPrivateProfileInt(U_GLOBAL,TEXT("PriorityBoost"),
  			 fPriorityBoost,squeakIniName);
+ 
+   fUseOpenGL   = 
+     GetPrivateProfileInt(U_GLOBAL,TEXT("B3DXUsesOpenGL"),
+ 			 fUseOpenGL,squeakIniName);
  #endif
  }
***************
*** 169,172 ****
--- 180,184 ----
    SetShowAllocations();
    SetPriorityBoost();
+   SetB3DXUsesOpenGL();
  }
  
***************
*** 196,201 ****
  	       TEXT("Allow file access"));
      AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_IMAGEWRITE, 
! 	       TEXT("Allow image writes"));
!     AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_SOCKETACCESS, 
  	       TEXT("Allow socket access"));
      AppendMenu(pMenu, MF_STRING | MF_POPUP, (int)hMenu,
--- 208,212 ----
  	       TEXT("Allow file access"));
      AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_IMAGEWRITE, 
! 	       TEXT("Allow image writes"));    AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_SOCKETACCESS, 
  	       TEXT("Allow socket access"));
      AppendMenu(pMenu, MF_STRING | MF_POPUP, (int)hMenu,
***************
*** 206,209 ****
--- 217,222 ----
      AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_DIRECTSOUND, 
  	       TEXT("Use DirectSound"));
+     AppendMenu(hMenu, MF_STRING | MF_UNCHECKED, ID_USEOPENGL,
+ 	       TEXT("Use OpenGL (instead of D3D)"));
      AppendMenu(hMenu,MF_STRING | MF_UNCHECKED, ID_DEFERUPDATES, 
  	       TEXT("Defer display update"));
***************
*** 334,337 ****
--- 347,354 ----
      fPriorityBoost = !fPriorityBoost;
      SetPriorityBoost();
+     break;
+   case ID_USEOPENGL:
+     fUseOpenGL = !fUseOpenGL;
+     SetB3DXUsesOpenGL();
      break;
    }

Index: sqWin32Prefs.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Prefs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sqWin32Prefs.h	28 Jan 2002 13:56:59 -0000	1.2
--- sqWin32Prefs.h	6 May 2002 10:36:25 -0000	1.3
***************
*** 24,28 ****
  #define ID_PRIORITYBOOST 0x0110
  
! #define ID_PREF_LAST 0x0110
  
  void TrackPrefsMenu(void);
--- 24,30 ----
  #define ID_PRIORITYBOOST 0x0110
  
! #define ID_USEOPENGL 0x0120
! 
! #define ID_PREF_LAST 0x0120
  
  void TrackPrefsMenu(void);

Index: sqWin32Window.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/vm/sqWin32Window.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sqWin32Window.c	4 May 2002 23:45:44 -0000	1.5
--- sqWin32Window.c	6 May 2002 10:36:25 -0000	1.6
***************
*** 91,94 ****
--- 91,95 ----
  BOOL fReduceCPUInBackground = 0; /* Should we reduce CPU usage when not active? */
  BOOL fUseDirectSound = 1; /* Do we use DirectSound?! */
+ BOOL fUseOpenGL = 0;      /* Do we use OpenGL vs. D3D?! */
  BOOL fPriorityBoost = 1;