--- Recording mergeinfo for merge of r30359 into '.':

G   .

git-svn-id: branches/fixes_3_0@31076 -

ide/fputils.pas

@@ -157,8 +157,12 @@ begin
             else
              FixFileName[i]:=s[i];
  {$else}
+ {$ifndef hasamiga}
       '/' : FixFileName[i]:='\';
  'A'..'Z' : FixFileName[i]:=char(byte(s[i])+32);
+ {$else}
+      '\' : FixFileName[i]:='/';
+ {$endif}
  {$endif}
      else
       FixFileName[i]:=s[i];

packages/opengl/src/tinygl.inc

@@ -115,6 +115,21 @@ syscall sysvbase TinyGLBase 304;
 procedure _GLClearDepth(gcl: pointer; depth: GLclampd);
 syscall sysvbase TinyGLBase 310;
 
+function  _GLRenderMode(gcl: pointer; mode: GLint): GLint;
+syscall sysvbase TinyGLBase 316;
+
+procedure _GLSelectBuffer(gcl: pointer; size: GLsizei; buffer: PGLuint);
+syscall sysvbase TinyGLBase 322;
+
+procedure _GLInitNames(gcl: pointer);
+syscall sysvbase TinyGLBase 328;
+
+procedure _GLPushName(gcl: pointer; name: GLuint);
+syscall sysvbase TinyGLBase 334;
+
+procedure _GLLoadName(gcl: pointer; name: GLuint);
+syscall sysvbase TinyGLBase 346;
+
 procedure _GLGenTextures(gcl: pointer; n: GLsizei; textures: PGLuint);
 syscall sysvbase TinyGLBase 352;
 
@@ -157,6 +172,9 @@ syscall sysvbase TinyGLBase 478;
 procedure _GLHint(gcl: pointer; target, mode: GLenum);
 syscall sysvbase TinyGLBase 484;
 
+procedure _GLGetIntegerv(gcl: pointer; pname: GLenum; params: PGLint);
+syscall sysvbase TinyGLBase 490;
+
 procedure _GLGetFloatv(gcl: pointer; pname: GLenum; params: PGLfloat);
 syscall sysvbase TinyGLBase 496;
 
@@ -312,9 +330,19 @@ syscall sysvbase TinyGLBase 1210;
 procedure _GLStencilOp(gcl: pointer; fail, zfail, zpass: GLenum);
 syscall sysvbase TinyGLBase 1216;
 
+procedure _GLClipPlane(gcl: pointer; plane: GLenum; const equation: PGLdouble);
+syscall sysvbase TinyGLBase 1270;
+
 procedure _GLColorMask(gcl: pointer; red, green, blue, alpha: GLboolean);
 syscall sysvbase TinyGLBase 1282;
+{$ENDIF}
 
+{$IFDEF GLU_UNIT}
+procedure _GLUPickMatrix(gcl: pointer; x:GLdouble; y:GLdouble; delX:GLdouble; delY:GLdouble; viewport:PGLint);
+syscall sysvbase TinyGLBase 1348;
+{$ENDIF}
+
+{$IFDEF GL_UNIT}
 procedure _GLCopyTexImage2D(gcl: pointer; target: GLenum; level: GLint; internalFormat: GLenum; x, y: GLint; width, height: GLsizei; border: GLint); inline;
 syscall sysvbase TinyGLBase 1402;
 {$ENDIF GL_UNIT}
@@ -360,6 +388,11 @@ begin
   _GLClearDepth(tglContext, depth);
 end;
 
+procedure glSelectBuffer(size: GLsizei; buffer: PGLuint); inline;
+begin
+  _GLSelectBuffer(tglContext, size, buffer);
+end;
+
 procedure glColorMask(red, green, blue, alpha: GLboolean); inline;
 begin
   _GLColorMask(tglContext, red, green, blue, alpha);
@@ -405,6 +438,11 @@ begin
   glGenLists:=_GLGenLists(tglContext, range);
 end;
 
+procedure glGetIntegerv(pname: GLenum; params: PGLint); inline;
+begin
+  _GLGetIntegerv(tglContext, pname, params);
+end;
+
 procedure glGetFloatv(pname: GLenum; params: PGLfloat); inline;
 begin
   _GLGetFloatv(tglContext, pname, params);
@@ -534,6 +572,11 @@ begin
   _GLStencilFunc(tglContext, func, ref, mask);
 end;
 
+procedure glClipPlane(plane: GLenum; const equation: PGLdouble); inline;
+begin
+  _GLClipPlane(tglContext, plane, equation);
+end;
+
 procedure glStencilOp(fail, zfail, zpass: GLenum); inline;
 begin
   _GLStencilOp(tglContext, fail, zfail, zpass);
@@ -645,6 +688,26 @@ begin
   _GLPushMatrix(tglContext);
 end;
 
+function glRenderMode(mode: GLint): GLint; inline;
+begin
+  glRenderMode:=_GLRenderMode(tglContext, mode);
+end;
+
+procedure glInitNames; inline;
+begin
+  _GLInitNames(tglContext);
+end;
+
+procedure glLoadName(name: GLuint); inline;
+begin
+  _GLLoadName(tglContext, name);
+end;
+
+procedure glPushName(name: GLuint); inline;
+begin
+  _GLPushName(tglContext, name);
+end;
+
 procedure glTexImage2D(target: GLenum; level, internalformat: GLint; width, height: GLsizei; border: GLint; format, atype: GLenum; const pixels: Pointer); inline;
 begin
   _GLTexImage2D(tglContext, target, level, internalformat, width, height, border, format, atype, pixels);
@@ -721,6 +784,11 @@ procedure gluPerspective(fovy, aspect, zNear, zFar: GLdouble); inline;
 begin
   _GLUPerspective(tglContext, fovy, aspect, zNear, zFar);
 end;
+
+procedure gluPickMatrix(x:GLdouble; y:GLdouble; delX:GLdouble; delY:GLdouble; viewport:PGLint); inline;
+begin
+  _GLUPickMatrix(tglContext, x, y, delX, delY, viewport);
+end;
 {$ENDIF GLU_UNIT}
 
 

packages/opengl/src/tinyglh.inc

@@ -56,17 +56,21 @@ procedure glFogfv(pname: GLenum; const params: PGLfloat); inline;
 procedure glFogi(pname: GLenum; param: GLint); inline;
 
 function  glGenLists(range: GLsizei): GLuint; inline;
+procedure glGetIntegerv(pname: GLenum; params: PGLint); inline;
 procedure glGetFloatv(pname: GLenum; params: PGLfloat); inline;
 function  glGetString(name: GLenum): PChar; inline;
 
 procedure glHint(target, mode: GLenum); inline;
 
 procedure glIndexi(c: GLint); inline;
+procedure glInitNames; inline;
 
 procedure glLightf(light, pname: GLenum; param: GLfloat); inline;
 procedure glLightfv(light, pname: GLenum; const params: PGLfloat); inline;
 procedure glLineWidth(width: GLfloat); inline;
 procedure glLoadIdentity; inline;
+procedure glLoadName(name: GLuint); inline;
+
 procedure glLightModelfv(pname: GLenum; const params: PGLfloat); inline;
 
 procedure glMaterialf(face, pname: GLenum; param: GLfloat); inline;
@@ -89,21 +93,26 @@ procedure glRasterPos3f(x, y, z: GLfloat); inline;
 procedure glReadPixels(x, y: GLint; width, height: GLsizei; format, atype: GLenum; pixels: Pointer); inline;
 
 procedure glShadeModel(mode: GLenum); inline;
+procedure glSelectBuffer(size: GLsizei; buffer: PGLuint); inline;
 
 procedure glStencilFunc(func: GLenum; ref: GLint; mask: GLuint); inline;
 procedure glStencilOp(fail, zfail, zpass: GLenum); inline;
 
+procedure glClipPlane(plane: GLenum; const equation: PGLdouble); inline;
+
 procedure glTexCoordPointer(size: GLint; atype: GLenum; stride: GLsizei; const pointer: Pointer); inline;
 procedure glTexParameterf(target: GLenum; pname: GLenum; param: GLfloat); inline;
 
 procedure glFrustum(left, right, bottom, top, zNear, zFar: GLdouble); inline;
 procedure glTranslatef(x, y, z: GLfloat); inline;
 procedure glScalef(x, y, z: GLfloat); inline;
+function  glRenderMode(mode: GLint): GLint; inline;
 procedure glRotatef(angle, x, y, z: GLfloat); inline;
 
 procedure glOrtho(left, right, bottom, top, zNear, zFar: GLdouble); inline;
 procedure glPopMatrix; inline;
 procedure glPushMatrix; inline;
+procedure glPushName(name: GLuint); inline;
 
 procedure glTexImage2D(target: GLenum; level, internalformat: GLint; width, height: GLsizei; border: GLint; format, atype: GLenum; const pixels: Pointer); inline;
 procedure glTexParameteri(target: GLenum; pname: GLenum; param: GLint); inline;
@@ -127,6 +136,7 @@ procedure glViewport(x, y: GLint; width, height: GLsizei); inline;
 procedure gluLookAt(eyex, eyey, eyez, centerx, centery, centerz, upx, upy, upz: GLdouble); inline;
 procedure gluOrtho2D(left,right, bottom, top: GLdouble); inline;
 procedure gluPerspective(fovy, aspect, zNear, zFar: GLdouble); inline;
+procedure gluPickMatrix(x:GLdouble; y:GLdouble; delX:GLdouble; delY:GLdouble; viewport:PGLint); inline;
 {$ENDIF GLU_UNIT}
 
 { ****************************************************************************************************** }