Experimental VirtualBox 3D acceleration support

neurolabusc · Jul 29, 2020 · d1ebc8f · d1ebc8f
1 parent e144ded
commit d1ebc8f
Show file tree

Hide file tree

Showing 10 changed files with 316 additions and 150 deletions.
diff --git a/gl_core_3d.pas b/gl_core_3d.pas
@@ -13,7 +13,7 @@ interface
 procedure BuildDisplayList(var faces: TFaces; vertices: TVertices; vRGBA: TVertexRGBA; var vao, vbo: gluint; Clr: TRGBA);
 //procedure SetLighting (var lPrefs: TPrefs);
 procedure DrawScene(w,h: integer; isFlipMeshOverlay, isOverlayClipped,isDrawMesh, isMultiSample: boolean; var lPrefs: TPrefs; origin : TPoint3f; ClipPlane: TPoint4f; scale, distance, elevation, azimuth: single; var lMesh,lNode: TMesh; lTrack: TTrack);
-procedure SetCoreUniforms(lProg: Gluint);
+//procedure SetCoreUniformsX(lProg: Gluint);
 procedure SetTrackUniforms (lineWidth, ScreenPixelX, ScreenPixelY: integer);
 //procedure BuildDisplayListStrip(Indices: TInts; Verts, vNorms: TVertices; vRGBA: TVertexRGBA; LineWidth: integer; var vao, vbo: gluint);
 procedure BuildDisplayListStrip(Indices: TInts; vertices, vNorm: TVertices; vRGBA: TVertexRGBA; vType: TInts; LineWidth: integer; var vao, vbo: gluint);
@@ -406,9 +406,7 @@ procedure SetTrackUniforms(lineWidth, ScreenPixelX, ScreenPixelY: integer);
   glPrimitiveRestartIndex(kPrimitiveRestart);
   glEnable(GL_PRIMITIVE_RESTART);
   {$IFNDEF TUBES}
-
   glUniform3f(glGetUniformLocation(gShader.programTrackID, pAnsiChar('LightPos')), gShader.lightPos.X, gShader.lightPos.Y, gShader.lightPos.Z);
-
   glUniform1f(glGetUniformLocation(gShader.programTrackID, pAnsiChar('Ambient')), gShader.TrackAmbient) ;
   glUniform1f(glGetUniformLocation(gShader.programTrackID, pAnsiChar('Diffuse')), gShader.TrackDiffuse) ;
   //glUniform1f(glGetUniformLocation(gShader.programTrackID, pAnsiChar('Specular')), gShader.TrackSpecular * 0.75) ; //<<<<<<<<<
@@ -418,7 +416,7 @@ procedure SetTrackUniforms(lineWidth, ScreenPixelX, ScreenPixelY: integer);
 
 end;
 
-procedure SetCoreUniforms (lProg: GLuint);
+(*procedure SetCoreUniforms(lProg: GLuint);
 var
   mv, mvp : TnMat44;
   n : TnMat33;
@@ -431,14 +429,12 @@ procedure SetCoreUniforms (lProg: GLuint);
   mv := ngl_ModelViewMatrix;
   n :=  ngl_NormalMatrix;
   mvpMat := glGetUniformLocation(lProg, pAnsiChar('ModelViewProjectionMatrix'));
-   mvMat := glGetUniformLocation(lProg, pAnsiChar('ModelViewMatrix'));
-   normMat := glGetUniformLocation(lProg, pAnsiChar('NormalMatrix'));
-
+  mvMat := glGetUniformLocation(lProg, pAnsiChar('ModelViewMatrix'));
+  normMat := glGetUniformLocation(lProg, pAnsiChar('NormalMatrix'))
   glUniformMatrix4fv(mvpMat, 1, kGL_FALSE, @mvp[0,0]); // note model not MVP!
   glUniformMatrix4fv(mvMat, 1, kGL_FALSE, @mv[0,0]);
   glUniformMatrix3fv(normMat, 1, kGL_FALSE, @n[0,0]);
-
-end;
+end; *)
 
 type
 TVtxNormClr = Packed Record
@@ -732,7 +728,7 @@ procedure SetLighting (var lPrefs: TPrefs);
   //Done by shader
 end;
 
-procedure SetOrtho (w,h: integer; Distance, MaxDistance: single; isMultiSample, isPerspective: boolean);
+procedure nSetOrtho (w,h: integer; Distance, MaxDistance: single; isMultiSample, isPerspective: boolean);
 const
  kScaleX  = 0.7;
 var
@@ -766,13 +762,12 @@ procedure DrawScene(w,h: integer; isFlipMeshOverlay, isOverlayClipped, isDrawMes
   glClearColor(red(lPrefs.BackColor)/255, green(lPrefs.BackColor)/255, blue(lPrefs.BackColor)/255, 0); //Set background
   glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
   glEnable(GL_DEPTH_TEST);
+
   nglMatrixMode(nGL_PROJECTION);
   nglLoadIdentity();
-  SetOrtho(w, h, Distance, kMaxDistance, isMultiSample, lPrefs.Perspective);
+  nSetOrtho(w, h, Distance, kMaxDistance, isMultiSample, lPrefs.Perspective);
   nglTranslatef(lPrefs.ScreenPan.X, lPrefs.ScreenPan.Y, 0 );
-
   nglMatrixMode (nGL_MODELVIEW);
-  //glDepthRange(0.001, 0.1);
   nglLoadIdentity ();
   //object size normalized to be -1...+1 in largest dimension.
   //closest/furthest possible vertex is therefore -1.73..+1.73 (e.g. cube where corner is sqrt(1+1+1) from origin)

diff --git a/gl_legacy_3d.pas b/gl_legacy_3d.pas
@@ -5,8 +5,7 @@
 interface
 
 uses
- {$IFDEF LEGACY_INDEXING} glext,{$ENDIF}
- {$IFDEF DGL} dglOpenGL, {$ELSE DGL} {$IFDEF COREGL}glcorearb, {$ELSE} gl, {$ENDIF}  {$ENDIF DGL}
+ {$IFDEF DGL} dglOpenGL, {$ELSE DGL} {$IFDEF COREGL}glcorearb, {$ELSE} gl, glext, {$ENDIF}  {$ENDIF DGL}
     prefs, math, Classes, SysUtils, mesh, matMath, Graphics, define_types, track;
 
 const
@@ -19,7 +18,7 @@ interface
     norm   : TPoint3f; //vertex normal
     clr : TRGBA;
   end;
-  const  kVert3d = '#version 120'
+  (*const  kVert3dx = '#version 120'
 +#10'attribute vec3 Vert;'
 +#10'attribute vec3 Norm;'
 +#10'attribute vec4 Clr;'
@@ -33,9 +32,27 @@ interface
 +#10'    vL = normalize(gl_LightSource[0].position.xyz);'
 +#10'    gl_Position = gl_ModelViewProjectionMatrix * vP;'
 +#10'    vClr = Clr;'
-+#10'}';
-  {$ELSE}
-  const  kVert3d = 'varying vec3 vN, vL, vV;'
++#10'}'; *)
+   const  kVert3d = '#version 120'
++#10'attribute vec3 Vert;'
++#10'attribute vec3 Norm;'
++#10'attribute vec4 Clr;'
++#10'varying vec3 vN, vL, vV;'
++#10'varying vec4 vClr, vP;'
++#10'uniform mat4 ModelViewProjectionMatrix;'
++#10'uniform mat4 ModelViewMatrix;'
++#10'uniform mat3 NormalMatrix;'
++#10'uniform vec3 LightPos = vec3(0.0, 20.0, 30.0); //LR, -DU+, -FN+'
++#10'void main() {'
+     +#10'    vN = normalize((NormalMatrix * Norm));'
+     +#10'    vP = vec4(Vert, 1.0);'
+     +#10'    gl_Position = ModelViewProjectionMatrix * vec4(Vert, 1.0);'
+     +#10'    vL = normalize(LightPos);'
+     +#10'    vV = -vec3(ModelViewMatrix*vec4(Vert,1.0));'
+     +#10'    vClr = Clr;'
+   +#10'}';
+    {$ELSE}
+  (*const  kVert3d = 'varying vec3 vN, vL, vV;'
   +#10'varying vec4 vP, vClr;'
   +#10'void main() {  '
   +#10'    gl_Position = ftransform();'
@@ -44,6 +61,21 @@ interface
   +#10'    vV = -vec3(gl_ModelViewMatrix*gl_Vertex);'
   +#10'    vClr = gl_Color;'
   +#10'    vP = gl_Vertex;'
+  +#10'}'; *)
+  const  kVert3d = '#version 120'
+  +#10'varying vec3 vN, vL, vV;'
+  +#10'varying vec4 vP, vClr;'
+  +#10'uniform mat4 ModelViewProjectionMatrix;'
+  +#10'uniform mat4 ModelViewMatrix;'
+  +#10'uniform mat3 NormalMatrix;'
+  +#10'uniform vec3 LightPos = vec3(0.0, 20.0, 30.0); //LR, -DU+, -FN+'
+  +#10'void main() {  '
+  +#10'    gl_Position = ModelViewProjectionMatrix * gl_Vertex;'
+  +#10'    vN = normalize(NormalMatrix * gl_Normal);'
+  +#10'    vL = normalize(LightPos);'
+  +#10'    vV = -vec3(ModelViewMatrix*gl_Vertex);'
+  +#10'    vClr = gl_Color;'
+  +#10'    vP = gl_Vertex;'
   +#10'}';
   {$ENDIF}
 
@@ -88,10 +120,13 @@ interface
  {$ENDIF}
   const kTrackShaderVert = 'varying vec3 vN;'
 +#10'varying vec4 vClr;'
++#10'uniform mat4 ModelViewProjectionMatrix;'
++#10'uniform mat4 ModelViewMatrix;'
++#10'uniform mat3 NormalMatrix;'
 +#10'void main()'
 +#10'{    '
-+#10'    vN = gl_NormalMatrix * gl_Normal;'
-+#10'    gl_Position = ftransform();'
++#10'    vN = normalize(NormalMatrix * gl_Normal);'
++#10'    gl_Position = ModelViewProjectionMatrix * gl_Vertex;'
 +#10'    vClr = gl_Color;'
 +#10'}';
 
@@ -109,7 +144,7 @@ interface
 +#10'    gl_FragColor = vec4(specClr*spec + difClr*dif + ambClr,1.0);'
 +#10'}';
 
-procedure SetLighting (var lPrefs: TPrefs);
+//procedure SetLighting (var lPrefs: TPrefs);
 {$IFDEF LEGACY_INDEXING}
 procedure BuildDisplayListIndexed(var faces: TFaces; vertices: TVertices; vRGBA: TVertexRGBA; var index_vbo, vertex_vbo: gluint; Clr: TRGBA);
 //procedure SetVertexAttrib(shaderProgram, vertex_vbo: GLuint);
@@ -118,11 +153,31 @@ procedure BuildDisplayListIndexed(var faces: TFaces; vertices: TVertices; vRGBA:
 function BuildDisplayList(var faces: TFaces; vertices: TVertices; vRGBA: TVertexRGBA; Clr: TRGBA): GLuint;
 function BuildDisplayListStrip(Indices: TInts; Verts, vNorms: TVertices; vRGBA: TVertexRGBA; LineWidth: integer): GLuint;
 procedure DrawScene(w,h: integer; isFlipMeshOverlay, isOverlayClipped, isDrawMesh, isMultiSample: boolean; var lPrefs: TPrefs; origin: TPoint3f; ClipPlane: TPoint4f; scale, distance, elevation, azimuth: single; var lMesh,lNode: TMesh; lTrack: TTrack);
+procedure SetTrackUniforms(lineWidth, ScreenPixelX, ScreenPixelY: integer);
 
 implementation
 
 uses shaderu,  gl_core_matrix;
 
+procedure SetTrackUniforms(lineWidth, ScreenPixelX, ScreenPixelY: integer);
+ var
+  p , mv, mvp : TnMat44;
+  n : TnMat33;
+  mvpMat, mvMat, normMat, pMat, lp: GLint;
+begin
+  glUseProgram(gShader.programTrackID);
+  mvp := ngl_ModelViewProjectionMatrix;
+  mv := ngl_ModelViewMatrix;
+  n :=  ngl_NormalMatrix;
+  mvpMat := glGetUniformLocation(gShader.programTrackID, pAnsiChar('ModelViewProjectionMatrix'));
+  mvMat := glGetUniformLocation(gShader.programTrackID, pAnsiChar('ModelViewMatrix'));
+  normMat := glGetUniformLocation(gShader.programTrackID, pAnsiChar('NormalMatrix'));
+  glUniformMatrix4fv(mvpMat, 1, kGL_FALSE, @mvp[0,0]);
+  glUniformMatrix4fv(mvMat, 1, kGL_FALSE, @mv[0,0]);
+  glUniformMatrix3fv(normMat, 1, kGL_FALSE, @n[0,0]);
+end;
+
+
 function BuildDisplayListStrip(Indices: TInts; Verts, vNorms: TVertices; vRGBA: TVertexRGBA; LineWidth: integer): GLuint;
 var
   i,j,  n: integer;
@@ -160,7 +215,7 @@ function BuildDisplayListStrip(Indices: TInts; Verts, vNorms: TVertices; vRGBA:
      glLineWidth(1);
 end;
 
-function TColorToF (C: TColor; i: integer): single;
+(*function TColorToF (C: TColor; i: integer): single;
 begin
      result := 1;
      if i = 1 then result := red(C)/255;
@@ -198,7 +253,7 @@ procedure SetLighting (var lPrefs: TPrefs);
   glMaterialfv (GL_FRONT_AND_BACK, GL_DIFFUSE, @objColor);
   glMaterialfv (GL_FRONT_AND_BACK, GL_SPECULAR, @wColor);
   glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, kMaterial[4]);
-end;
+end; *)
 
 
 {$IFNDEF DGL}  //gl.pp does not link to the glu functions, so we will write our own
@@ -254,6 +309,30 @@ procedure SetOrtho (w,h: integer; Distance, MaxDistance: single; isMultiSample,
   end;
 end;
 
+procedure nSetOrtho (w,h: integer; Distance, MaxDistance: single; isMultiSample, isPerspective: boolean);
+const
+ kScaleX  = 0.7;
+var
+   aspectRatio, scaleX: single;
+   z: integer;
+begin
+ if (isMultiSample) then //and (gZoom <= 1) then
+   z := 2
+ else
+   z := 1;
+ glViewport( 0, 0, w*z, h*z );
+ ScaleX := kScaleX * Distance;
+ AspectRatio := w / h;
+ if isPerspective then
+    ngluPerspective(40.0, w/h, 0.01, MaxDistance+1)
+  else begin
+     if AspectRatio > 1 then //Wide window                                           xxx
+        nglOrtho (-ScaleX * AspectRatio, ScaleX * AspectRatio, -ScaleX, ScaleX, 0.0, 2.0) //Left, Right, Bottom, Top
+     else //Tall window
+       nglOrtho (-ScaleX, ScaleX, -ScaleX/AspectRatio, ScaleX/AspectRatio, 0.0,  2.0); //Left, Right, Bottom, Top
+  end;
+end;
+
 
 procedure DrawScene(w,h: integer; isFlipMeshOverlay, isOverlayClipped, isDrawMesh, isMultiSample: boolean; var lPrefs: TPrefs; origin: TPoint3f; ClipPlane: TPoint4f; scale, distance, elevation, azimuth: single; var lMesh,lNode: TMesh; lTrack: TTrack);
 var
@@ -272,36 +351,42 @@ procedure DrawScene(w,h: integer; isFlipMeshOverlay, isOverlayClipped, isDrawMes
  //glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
  glClear(GL_COLOR_BUFFER_BIT or  GL_DEPTH_BUFFER_BIT or GL_STENCIL_BUFFER_BIT );
  glEnable(GL_NORMALIZE);
- glMatrixMode(GL_PROJECTION);
+ (*glMatrixMode(GL_PROJECTION);
  glLoadIdentity();
  SetOrtho (w,h,Distance, kMaxDistance, isMultiSample, lPrefs.Perspective);
  glTranslatef(lPrefs.ScreenPan.X, lPrefs.ScreenPan.Y, 0 );
  glMatrixMode (GL_MODELVIEW);
  glLoadIdentity ();
- glLightfv(GL_LIGHT0, GL_POSITION, @gShader.lightpos);
- //caption := floattostr(lightpos[1])+'x'+ floattostr(lightpos[2])+'x'+ floattostr(lightpos[3]);
- //glDisable(GL_CULL_FACE);
- //glEnable(GL_DEPTH_TEST);
- //glEnable(GL_BLEND);
- glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- //glTranslatef(0,0, -Scale * 8);
  glScalef(0.5/Scale, 0.5/Scale, 0.5/Scale);
- if lPrefs.Perspective then
-        glTranslatef(0,0, -Scale*2* Distance )
- else
-     glTranslatef(0,0, -Scale*2 );
- glRotatef(90- Elevation,-1,0,0);
- glRotatef(-Azimuth,0,0,1);
- //glScalef(0.5/Scale, 0.5/Scale, 0.5/Scale);
- //origin := GetOrigin;
- glTranslatef(-origin.X, -origin.Y, -origin.Z);
+if lPrefs.Perspective then
+       glTranslatef(0,0, -Scale*2* Distance )
+else
+    glTranslatef(0,0, -Scale*2 );
+glRotatef(90- Elevation,-1,0,0);
+glRotatef(-Azimuth,0,0,1);
+glTranslatef(-origin.X, -origin.Y, -origin.Z);
+setLighting (lPrefs);
+ *)
+  nglMatrixMode(nGL_PROJECTION);
+  nglLoadIdentity();
+  nSetOrtho(w, h, Distance, kMaxDistance, isMultiSample, lPrefs.Perspective);
+  nglTranslatef(lPrefs.ScreenPan.X, lPrefs.ScreenPan.Y, 0 );
+  nglMatrixMode (nGL_MODELVIEW);
+  nglLoadIdentity ();
+  //object size normalized to be -1...+1 in largest dimension.
+  //closest/furthest possible vertex is therefore -1.73..+1.73 (e.g. cube where corner is sqrt(1+1+1) from origin)
+  nglScalef(0.5/Scale, 0.5/Scale, 0.5/Scale);
+  if lPrefs.Perspective then
+      nglTranslatef(0,0, -Scale*2*Distance )
+  else
+     nglTranslatef(0,0,  -Scale*2 );
+  nglRotatef(90-Elevation,-1,0,0);
+  nglRotatef(-Azimuth,0,0,1);
+  nglTranslatef(-origin.X, -origin.Y, -origin.Z);
+
+
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
  glShadeModel(GL_SMOOTH);
- setLighting (lPrefs);
- //glEnable(GL_BLEND);
- //glBlendFunc(GL_ONE, GL_ZERO);
- //glEnable(GL_BLEND);
- //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- //glLineWidth(0);   // GL_INVALID_VALUE is generated if width is less than or equal to 0.
  if lTrack.n_count > 0 then begin
     if lTrack.isTubes then
          RunMeshGLSL (asPt4f(2,ClipPlane.Y,ClipPlane.Z,ClipPlane.W),  lPrefs.ShaderForBackgroundOnly) //disable clip plane

diff --git a/glcube.pas b/glcube.pas
@@ -6,7 +6,8 @@
 interface
 
 uses
-  {$IFDEF COREGL}glcorearb,  gl_core_matrix, {$ELSE}gl, glext, {$ENDIF}
+  {$IFDEF COREGL}glcorearb,   {$ELSE}gl, glext, {$ENDIF}
+  gl_core_matrix,
   shaderu, Classes, SysUtils, Graphics, OpenGLContext, math, dialogs;
 
 type
@@ -586,7 +587,7 @@ procedure  TGLCube.Draw(Width,Height: integer);
   if  sz > ScrnH then sz := ScrnH;
   if sz < 10 then exit;
   sz := sz * SizeFrac;
-  {$IFDEF COREGL}
+
 
   nglMatrixMode(nGL_MODELVIEW);
   nglLoadIdentity;
@@ -600,7 +601,7 @@ procedure  TGLCube.Draw(Width,Height: integer);
       nglTranslatef(1.8*sz,1.8*sz,0);
   nglRotatef(fElevation-90,-1,0,0);
   nglRotatef(-fAzimuth,0,0,1);
-  {$ELSE}
+  {$IFNDEF COREGL}
   glUseProgram(0);
   glEnable (GL_BLEND);
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

diff --git a/mainunit.pas b/mainunit.pas
@@ -4952,7 +4952,7 @@ procedure TGLForm1.CreateRender(w,h: integer; isToScreen: boolean);
   origin := GetOrigin(scale);
   //glUseProgram(gShader.program3d);
   {$IFNDEF COREGL}
-  SetLighting(gPrefs);
+  //SetLighting(gPrefs);
   {$ENDIF}
   isMultiPass := true;
   if (gPrefs.RenderQuality = kRenderPoor) then isMultiPass := false;

diff --git a/mesh.pas b/mesh.pas
@@ -1445,14 +1445,14 @@ procedure DrawOverlay(prog: GLuint);
          RunOverlayGLSL(clipPlane);
          glBindVertexArray(vao);
          glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,vbo);
-         glDrawElements(GL_TRIANGLES,  Length(nFaces)* 3, GL_UNSIGNED_INT, nil);
+         glDrawElements(GL_TRIANGLES,  nFaces * 3, GL_UNSIGNED_INT, nil);
          glBindVertexArray(0);
       end;
   end else begin
     if (isVisible) and (nFaces > 0) then begin
       glBindVertexArray(vao);
       glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,vbo);
-      glDrawElements(GL_TRIANGLES, nFaces* 3, GL_UNSIGNED_INT, nil);
+      glDrawElements(GL_TRIANGLES, nFaces * 3, GL_UNSIGNED_INT, nil);
       glBindVertexArray(0);
     end;
     if (vaoOverlay <> 0) and (vboOverlay <> 0) and (nFacesOverlay > 0) then begin