|
From: John M M. <jo...@us...> - 2002-09-27 19:58:23
|
Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin
In directory usw-pr-cvs1:/tmp/cvs-serv13722/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin
Modified Files:
sqMacOpenGL.c
Log Message:
3.2.8b8 changes per Andreas instructions for TEA support
Index: sqMacOpenGL.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sqMacOpenGL.c 31 May 2002 16:49:42 -0000 1.6
--- sqMacOpenGL.c 27 Sep 2002 19:58:20 -0000 1.7
***************
*** 250,258 ****
}
! int glCreateRenderer(int allowSoftware, int allowHardware, int x, int y, int w, int h)
{
! int index, i;
! GLint hwAttrib[] = { AGL_RGBA, AGL_DOUBLEBUFFER, AGL_ACCELERATED, AGL_DEPTH_SIZE, 16, AGL_NONE };
! GLint swAttrib[] = { AGL_RGBA, AGL_PIXEL_SIZE, 0, AGL_OFFSCREEN, AGL_DEPTH_SIZE, 16, AGL_NONE };
AGLPixelFormat fmt;
AGLContext ctx;
--- 250,258 ----
}
! int glCreateRendererFlags(int x, int y, int w, int h, int flags)
{
! int index, i, allowSoftware, allowHardware;
! GLint hwAttrib[] = { AGL_STENCIL_SIZE, 0, AGL_RGBA, AGL_DOUBLEBUFFER, AGL_ACCELERATED, AGL_DEPTH_SIZE, 16, AGL_NONE};
! GLint swAttrib[] = { AGL_STENCIL_SIZE, 0, AGL_RGBA, AGL_PIXEL_SIZE, 0, AGL_OFFSCREEN, AGL_DEPTH_SIZE, 16, AGL_NONE };
AGLPixelFormat fmt;
AGLContext ctx;
***************
*** 263,267 ****
char *string;
GDHandle tempGDH;
! Rect ignore;
for(index=0; index < MAX_RENDERER; index++) {
--- 263,282 ----
char *string;
GDHandle tempGDH;
! Rect ignore;
!
! #define SUPPORTED_FLAGS (B3D_HARDWARE_RENDERER | B3D_SOFTWARE_RENDERER | B3D_STENCIL_BUFFER)
! if(flags & ~SUPPORTED_FLAGS) {
! DPRINTF(1, (fp, "ERROR: Unsupported renderer flags (%d)\n", flags));
! return -1;
! }
! #undef SUPPORTED_FLAGS
!
! /* interpret renderer flags */
! allowSoftware = (flags & B3D_SOFTWARE_RENDERER) != 0;
! allowHardware = (flags & B3D_HARDWARE_RENDERER) != 0;
! if(flags & B3D_STENCIL_BUFFER) {
! hwAttrib[1] = 1;
! swAttrib[1] = 1;
! }
for(index=0; index < MAX_RENDERER; index++) {
|