[Squeak-Commits] squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin sqMacOpenGL.c,1.5,1.6

[John M M. <jo...@us...>]

Update of /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin
In directory usw-pr-cvs1:/tmp/cvs-serv29114/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin

Modified Files:
	sqMacOpenGL.c 
Log Message:
3.2.7b6 Andreas changed glGetIntProperty() -> glGetIntPropertyOS() so we follow suit.

Index: sqMacOpenGL.c
===================================================================
RCS file: /cvsroot/squeak/squeak/platforms/Mac OS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sqMacOpenGL.c	1 Mar 2002 00:15:57 -0000	1.5
--- sqMacOpenGL.c	31 May 2002 16:49:42 -0000	1.6
***************
*** 446,450 ****
  /*****************************************************************************/
  
! int glGetIntProperty(int handle, int prop)
  {
  	GLint v;
--- 446,450 ----
  /*****************************************************************************/
  
! int glGetIntPropertyOS(int handle, int prop)
  {
  	GLint v;
***************
*** 456,482 ****
  			aglGetInteger(renderer->context, AGL_SWAP_INTERVAL, &v);
  			return v;
- 		case 1: /* backface culling */
- 			if(!glIsEnabled(GL_CULL_FACE)) return 0;
- 			glGetIntegerv(GL_FRONT_FACE, &v);
- 			if(v == GL_CW) return 1;
- 			if(v == GL_CCW) return -1;
- 			return 0;
- 		case 2: /* polygon mode */
- 			glGetIntegerv(GL_POLYGON_MODE, &v);
- 			ERROR_CHECK;
- 			return v;
- 		case 3: /* point size */
- 			glGetIntegerv(GL_POINT_SIZE, &v);
- 			ERROR_CHECK;
- 			return v;
- 		case 4: /* line width */
- 			glGetIntegerv(GL_LINE_WIDTH, &v);
- 			ERROR_CHECK;
- 			return v;
  	}
  	return 0;
  }
  
! int glSetIntProperty(int handle, int prop, int value)
  {
  	glRenderer *renderer = glRendererFromHandle(handle);
--- 456,464 ----
  			aglGetInteger(renderer->context, AGL_SWAP_INTERVAL, &v);
  			return v;
  	}
  	return 0;
  }
  
! int glSetIntPropertyOS(int handle, int prop, int value)
  {
  	glRenderer *renderer = glRendererFromHandle(handle);
***************
*** 486,514 ****
  		case -1: /* vertical blank synchronization */
  			aglSetInteger(renderer->context, AGL_SWAP_INTERVAL, (GLint*) &value);
- 			return 1;
- 		case 1: /* backface culling */
- 			if(!value) {
- 				glDisable(GL_CULL_FACE);
- 				ERROR_CHECK;
- 				return 1;
- 			}
- 			glEnable(GL_CULL_FACE);
- 			glFrontFace(value == 1 ? GL_CCW : GL_CW);
- 			ERROR_CHECK;
- 			return 1;
- 		case 2: /* polygon mode */
- 			if(value == 0) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
- 			else if(value == 1) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
- 			else if(value == 2) glPolygonMode(GL_FRONT_AND_BACK, GL_POINT);
- 			else return 0;
- 			ERROR_CHECK;
- 			return 1;
- 		case 3: /* point size */
- 			glPointSize(value);
- 			ERROR_CHECK;
- 			return 1;
- 		case 4: /* line width */
- 			glLineWidth(value);
- 			ERROR_CHECK;
  			return 1;
  	}
--- 468,471 ----