[Squeak-Commits] squeak/platforms/win32/plugins/B3DAcceleratorPlugin sqWin32D3D.c,1.4,1.5 sqWin32OpenGL.c,1.3,1.4

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

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

Modified Files:
	sqWin32D3D.c sqWin32OpenGL.c 
Log Message:
unified D3D and OpenGL support

Index: sqWin32D3D.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32D3D.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sqWin32D3D.c	4 May 2002 23:20:27 -0000	1.4
--- sqWin32D3D.c	6 May 2002 10:36:25 -0000	1.5
***************
*** 54,58 ****
--- 54,62 ----
     10 - print information about each vertex and face
  */
+ #ifndef B3DX_GL
  int verboseLevel = 1;
+ #else
+ extern int verboseLevel;
+ #endif
  
  #define ERROR_CHECK if(FAILED(hRes)) { DPRINTF(2, (fp, "Error (%x) in %s, line %d\n", hRes, __FILE__, __LINE__))}
***************
*** 137,142 ****
  
  #define MAX_RENDERER 16
! d3dRenderer *current = NULL;
! d3dRenderer allRenderer[MAX_RENDERER];
  
  #define RELEASE(lp) if(lp) { lp->lpVtbl->Release(lp); lp = NULL; }
--- 141,146 ----
  
  #define MAX_RENDERER 16
! static d3dRenderer *current = NULL;
! static d3dRenderer allRenderer[MAX_RENDERER];
  
  #define RELEASE(lp) if(lp) { lp->lpVtbl->Release(lp); lp = NULL; }

Index: sqWin32OpenGL.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/win32/plugins/B3DAcceleratorPlugin/sqWin32OpenGL.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sqWin32OpenGL.c	4 May 2002 23:20:27 -0000	1.3
--- sqWin32OpenGL.c	6 May 2002 10:36:25 -0000	1.4
***************
*** 44,49 ****
  static HWND *theSTWindow = NULL; /* a reference to Squeak's main window */
  
! glRenderer *current = NULL;
! glRenderer allRenderer[MAX_RENDERER];
  
  static float blackLight[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
--- 44,49 ----
  static HWND *theSTWindow = NULL; /* a reference to Squeak's main window */
  
! static glRenderer *current = NULL;
! static glRenderer allRenderer[MAX_RENDERER];
  
  static float blackLight[4] = { 0.0f, 0.0f, 0.0f, 0.0f };