[Squeak-Commits] squeak/platforms/Cross/plugins/B3DAcceleratorPlugin B3DAcceleratorPlugin.h,1.3,1.4

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

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

Modified Files:
	B3DAcceleratorPlugin.h 
Log Message:
Added renderer creation flags

Index: B3DAcceleratorPlugin.h
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Cross/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** B3DAcceleratorPlugin.h	29 May 2002 11:42:14 -0000	1.3
--- B3DAcceleratorPlugin.h	5 Sep 2002 19:29:13 -0000	1.4
***************
*** 58,73 ****
  } B3DPrimitiveLight;
  
! #ifdef TEA
! #warning "**************************************************************"
! #warning "**************************************************************"
! #warning "**************************************************************"
! #warning
! #warning "TEA: D3D disabled"
! #warning
! #warning "**************************************************************"
! #warning "**************************************************************"
! #warning "**************************************************************"
! # define WIN32_PURE_GL
! #endif
  
  /* Win32 defaults to DUAL D3D/GL interface everyone else to OpenGL */
--- 58,72 ----
  } B3DPrimitiveLight;
  
! /* Renderer creation flags:
!    B3D_SOFTWARE_RENDERER: Enable use of software renderers
!    B3D_HARDWARE_RENDERER: Enable use of hardware renderers
!    B3D_STENCIL_BUFFER:    Request stencil buffer
!    More flags may be added - if they are not supported by the platform
!    code the creation primitive should fail.
! */
! #define B3D_SOFTWARE_RENDERER 0x0001
! #define B3D_HARDWARE_RENDERER 0x0002
! #define B3D_STENCIL_BUFFER    0x0004
! 
  
  /* Win32 defaults to DUAL D3D/GL interface everyone else to OpenGL */
***************
*** 84,87 ****
--- 83,90 ----
  #endif
  
+ /* b3dxCreateRenderer is now obsolete but older plugin sources may still use it */
+ #define b3dxCreateRenderer(sw,hw,x,y,w,h) b3dxCreateRendererFlags(x,y,w,h, (sw ? B3D_SOFTWARE_RENDERER : 0) | (hw ? B3D_HARDWARE_RENDERER : 0))
+ 
+ 
  #if defined(B3DX_GL)
  #define b3dxInitialize            glInitialize
***************
*** 97,101 ****
  #define b3dxCompositeTexture      glCompositeTexture
  
! #define b3dxCreateRenderer        glCreateRenderer
  #define b3dxDestroyRenderer        glDestroyRenderer
  #define b3dxIsOverlayRenderer     glIsOverlayRenderer
--- 100,104 ----
  #define b3dxCompositeTexture      glCompositeTexture
  
! #define b3dxCreateRendererFlags   glCreateRendererFlags
  #define b3dxDestroyRenderer        glDestroyRenderer
  #define b3dxIsOverlayRenderer     glIsOverlayRenderer
***************
*** 139,143 ****
  #define b3dxCompositeTexture      d3dCompositeTexture
  
! #define b3dxCreateRenderer        d3dCreateRenderer
  #define b3dxDestroyRenderer        d3dDestroyRenderer
  #define b3dxGetRendererSurfaceHandle d3dGetRendererSurfaceHandle
--- 142,146 ----
  #define b3dxCompositeTexture      d3dCompositeTexture
  
! #define b3dxCreateRendererFlags    d3dCreateRendererFlags
  #define b3dxDestroyRenderer        d3dDestroyRenderer
  #define b3dxGetRendererSurfaceHandle d3dGetRendererSurfaceHandle
***************
*** 181,185 ****
  
  /* Renderer primitives */
! int b3dxCreateRenderer(int allowSoftware, int allowHardware, int x, int y, int w, int h); /* return handle or -1 on error */
  int b3dxDestroyRenderer(int handle); /* return true on success, else false */
  int b3dxIsOverlayRenderer(int handle); /* return true/false */
--- 184,188 ----
  
  /* Renderer primitives */
! int b3dxCreateRendererFlags(int x, int y, int w, int h, int flags); /* return handle or -1 on error */
  int b3dxDestroyRenderer(int handle); /* return true on success, else false */
  int b3dxIsOverlayRenderer(int handle); /* return true/false */
***************
*** 235,240 ****
  #define b3dxCompositeTexture(r,hh,x,y,w,h,t) \
    (glMode ? glCompositeTexture(r,hh,x,y,w,h,t) : d3dCompositeTexture(r,hh,x,y,w,h,t))
! #define b3dxCreateRenderer(sw,hw,x,y,w,h) \
!   (glMode ? glCreateRenderer(sw,hw,x,y,w,h) : d3dCreateRenderer(sw,hw,x,y,w,h))
  #define b3dxDestroyRenderer(h) \
    (glMode ? glDestroyRenderer(h) : d3dDestroyRenderer(h))
--- 238,243 ----
  #define b3dxCompositeTexture(r,hh,x,y,w,h,t) \
    (glMode ? glCompositeTexture(r,hh,x,y,w,h,t) : d3dCompositeTexture(r,hh,x,y,w,h,t))
! #define b3dxCreateRendererFlags(x,y,w,h,f) \
!   (glMode ? glCreateRendererFlags(x,y,w,h,f) : d3dCreateRendererFlags(x,y,w,h,f))
  #define b3dxDestroyRenderer(h) \
    (glMode ? glDestroyRenderer(h) : d3dDestroyRenderer(h))