Fix support for 64-bit attributes and uniforms

hyazinthh · hyazinthh · commit bdfb3e78604f · 2026-04-07T17:20:52.000+02:00
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,5 @@
+- Fixed support for 64-bit attributes and uniforms
+
 ### 5.6.4
 - [GL] Dispose MultimediaTimer in LodRenderer to avoid resource exhaustion
 - [GL] Fixed M22f, M23f, M33f geometry attributes in LodRenderer
diff --git a/paket.dependencies b/paket.dependencies
@@ -22,9 +22,9 @@ nuget Aardvark.Base.Fonts                           ~> 5.3.20
 
 nuget Aardvark.Assembler                            ~> 0.1.0
 
-nuget FShade.Core                                   ~> 5.7.0
-nuget FShade                                        ~> 5.7.0
-nuget FShade.Debug                                  ~> 5.7.0
+nuget FShade.Core                                   ~> 5.7.3
+nuget FShade                                        ~> 5.7.3
+nuget FShade.Debug                                  ~> 5.7.3
 
 nuget Unofficial.OpenVR					            ~> 1.1.0
 nuget CommonMark.NET                                ~> 0.15.1
diff --git a/paket.lock b/paket.lock
@@ -123,39 +123,39 @@ NUGET
       Hopac (>= 0.4.1)
     FsCheck (2.16.6)
       FSharp.Core (>= 4.2.3)
-    FShade (5.7)
-      FShade.Core (5.7)
-      FShade.GLSL (5.7)
-      FShade.Imperative (5.7)
-      FShade.SpirV (5.7)
-    FShade.Core (5.7)
+    FShade (5.7.3)
+      FShade.Core (5.7.3)
+      FShade.GLSL (5.7.3)
+      FShade.Imperative (5.7.3)
+      FShade.SpirV (5.7.3)
+    FShade.Core (5.7.3)
       Aardvark.Base (>= 5.3.18 < 5.4)
       Aardvark.Base.FSharp (>= 5.3.18 < 5.4)
-      FShade.Imperative (5.7)
-      FSharp.Core (>= 8.0)
-    FShade.Debug (5.7)
+      FShade.Imperative (5.7.3)
+      FSharp.Core (>= 8.0.100)
+    FShade.Debug (5.7.3)
       Aardvark.Base (>= 5.3.18 < 5.4)
       Aardvark.Base.FSharp (>= 5.3.18 < 5.4)
-      FShade.Core (5.7)
-      FShade.Imperative (5.7)
-      FSharp.Core (>= 8.0)
-    FShade.GLSL (5.7)
+      FShade.Core (5.7.3)
+      FShade.Imperative (5.7.3)
+      FSharp.Core (>= 8.0.100)
+    FShade.GLSL (5.7.3)
       Aardvark.Base (>= 5.3.18 < 5.4)
       Aardvark.Base.FSharp (>= 5.3.18 < 5.4)
-      FShade.Core (5.7)
-      FShade.Imperative (5.7)
-      FSharp.Core (>= 8.0)
-    FShade.Imperative (5.7)
+      FShade.Core (5.7.3)
+      FShade.Imperative (5.7.3)
+      FSharp.Core (>= 8.0.100)
+    FShade.Imperative (5.7.3)
       Aardvark.Base (>= 5.3.18 < 5.4)
       Aardvark.Base.FSharp (>= 5.3.18 < 5.4)
-      FSharp.Core (>= 8.0)
+      FSharp.Core (>= 8.0.100)
       FsPickler (>= 5.3.2 < 5.4)
-    FShade.SpirV (5.7)
+    FShade.SpirV (5.7.3)
       Aardvark.Base (>= 5.3.18 < 5.4)
       Aardvark.Base.FSharp (>= 5.3.18 < 5.4)
-      FShade.Core (5.7)
-      FShade.Imperative (5.7)
-      FSharp.Core (>= 8.0)
+      FShade.Core (5.7.3)
+      FShade.Imperative (5.7.3)
+      FSharp.Core (>= 8.0.100)
     FSharp.Core (8.0.100)
     FSharp.Data (6.4)
       FSharp.Core (>= 6.0.1)
diff --git a/src/Aardvark.Rendering.GL/Resources/Pointers.fs b/src/Aardvark.Rendering.GL/Resources/Pointers.fs
@@ -116,7 +116,11 @@ module PointerContextExtensions =
                         let mt = typeof<GLSLType.Interop.M24f>
                         struct (mt, struct (V2i(4, 2), VertexAttribPointerType.Float, sizeof<float32>))
 
-                    m24f :: builtin
+                    let m24d =
+                        let mt = typeof<GLSLType.Interop.M24d>
+                        struct (mt, struct (V2i(4, 2), VertexAttribPointerType.Double, sizeof<float>))
+
+                    m24f :: m24d :: builtin
 
                 Dictionary.ofListV (primitives @ vectors @ colors @ matrices)
 
diff --git a/src/Aardvark.Rendering.Vulkan/Management/ResourceManager.fs b/src/Aardvark.Rendering.Vulkan/Management/ResourceManager.fs
@@ -904,9 +904,13 @@ module Resources =
 
             let inputAttributes =
                 paramsWithInputs |> List.collecti (fun binding struct (location, desc) ->
-                    desc.offsets |> List.mapi (fun i offset ->
+                    let slotsPerRow =
+                        let rowSize = VkFormat.pixelSizeInBytes desc.inputFormat
+                        (rowSize + 15) / 16
+
+                    desc.offsets |> List.mapi (fun row offset ->
                         VkVertexInputAttributeDescription(
-                            uint32 (location + i),
+                            uint32 (location + row * slotsPerRow),
                             uint32 binding,
                             desc.inputFormat,
                             uint32 offset
diff --git a/src/Aardvark.Rendering/Uniforms/UniformWriters.fs b/src/Aardvark.Rendering/Uniforms/UniformWriters.fs
@@ -54,6 +54,43 @@ module GLSLType =
                 { M00 = float32 m.M00; M01 = float32 m.M01; M02 = float32 m.M02; M03 = 0.0f
                   M10 = float32 m.M10; M11 = float32 m.M11; M12 = float32 m.M12; M13 = 0.0f }
 
+        /// Type representing 2x4 matrices
+        /// Only used for padding rows of 2x3 matrices
+        [<Struct; StructLayout(LayoutKind.Sequential)>]
+        type M24d =
+            val M00 : float
+            val M01 : float
+            val M02 : float
+            val M03 : float
+            val M10 : float
+            val M11 : float
+            val M12 : float
+            val M13 : float
+
+            static do PrimitiveValueConverter.addConverters [
+                // padding for 2 row matrices
+                ( fun (i : M22f) -> M24d &i ) :> obj
+                ( fun (i : M22d) -> M24d &i ) :> obj
+                ( fun (i : M23f) -> M24d &i ) :> obj
+                ( fun (i : M23d) -> M24d &i ) :> obj
+            ]
+
+            new (m : inref<M22f>) =
+                { M00 = float m.M00; M01 = float m.M01; M02 = 0.0; M03 = 0.0
+                  M10 = float m.M10; M11 = float m.M11; M12 = 0.0; M13 = 0.0 }
+
+            new (m : inref<M22d>) =
+                { M00 = m.M00; M01 = m.M01; M02 = 0.0; M03 = 0.0
+                  M10 = m.M10; M11 = m.M11; M12 = 0.0; M13 = 0.0 }
+
+            new (m : inref<M23f>) =
+                { M00 = float m.M00; M01 = float m.M01; M02 = float m.M02; M03 = 0.0
+                  M10 = float m.M10; M11 = float m.M11; M12 = float m.M12; M13 = 0.0 }
+
+            new (m : inref<M23d>) =
+                { M00 = m.M00; M01 = m.M01; M02 = m.M02; M03 = 0.0
+                  M10 = m.M10; M11 = m.M11; M12 = m.M12; M13 = 0.0 }
+
         module Patterns =
             open TypeMeta
 
@@ -64,6 +101,7 @@ module GLSLType =
                 | MatrixOf r -> ValueSome r
                 | _ ->
                     if t = typeof<M24f> then ValueSome (V2i(4, 2), typeof<float32>)
+                    elif t = typeof<M24d> then ValueSome (V2i(4, 2), typeof<float>)
                     else ValueNone
 
     let toType =
@@ -83,7 +121,7 @@ module GLSLType =
 
             Float(16), typeof<float16>
             Float(32), typeof<float32>
-            Float(64), typeof<float32>
+            Float(64), typeof<float>
 
             Vec(3, Int(false, 8)), typeof<C3b>
             Vec(4, Int(false, 8)), typeof<C4b>
@@ -103,21 +141,21 @@ module GLSLType =
             Vec(3, Float(32)), typeof<V3f>
             Vec(4, Float(32)), typeof<V4f>
 
-            Vec(2, Float(64)), typeof<V2f>
-            Vec(3, Float(64)), typeof<V3f>
-            Vec(4, Float(64)), typeof<V4f>
-
-            Mat(2,2,Float(32)), typeof<Interop.M24f> // Matrix rows need to be padded to 4 elements according to std140
-            Mat(2,3,Float(32)), typeof<Interop.M24f>
-            Mat(3,3,Float(32)), typeof<M34f>
-            Mat(3,4,Float(32)), typeof<M34f>
-            Mat(4,4,Float(32)), typeof<M44f>
-
-            Mat(2,2,Float(64)), typeof<Interop.M24f>
-            Mat(2,3,Float(64)), typeof<Interop.M24f>
-            Mat(3,3,Float(64)), typeof<M34f>
-            Mat(3,4,Float(64)), typeof<M34f>
-            Mat(4,4,Float(64)), typeof<M44f>
+            Vec(2, Float(64)), typeof<V2d>
+            Vec(3, Float(64)), typeof<V3d>
+            Vec(4, Float(64)), typeof<V4d>
+
+            Mat(2, 2, Float(32)), typeof<Interop.M24f> // Matrix rows need to be padded to 4 elements according to std140
+            Mat(2, 3, Float(32)), typeof<Interop.M24f>
+            Mat(3, 3, Float(32)), typeof<M34f>
+            Mat(3, 4, Float(32)), typeof<M34f>
+            Mat(4, 4, Float(32)), typeof<M44f>
+
+            Mat(2, 2, Float(64)), typeof<M22d>
+            Mat(2, 3, Float(64)), typeof<Interop.M24d>
+            Mat(3, 3, Float(64)), typeof<M34d>
+            Mat(3, 4, Float(64)), typeof<M34d>
+            Mat(4, 4, Float(64)), typeof<M44d>
         ]
 
     let rec sizeof (t : GLSLType) =
diff --git a/src/GLVM/glvm.cpp b/src/GLVM/glvm.cpp
@@ -102,6 +102,7 @@ DllExport(void) vmInit()
 	glDrawArraysInstanced = (PFNGLDRAWARRAYSINSTANCEDPROC)getProc("glDrawArraysInstanced");
 	glDrawElementsBaseVertex = (PFNGLDRAWELEMENTSBASEVERTEXPROC)getProc("glDrawElementsBaseVertex");
 	glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)getProc("glVertexAttribPointer");
+	glVertexAttribLPointer = (PFNGLVERTEXATTRIBLPOINTERPROC)getProc("glVertexAttribLPointer");
 	glVertexAttribIPointer = (PFNGLVERTEXATTRIBIPOINTERPROC)getProc("glVertexAttribIPointer");
 	glUniform1fv = (PFNGLUNIFORM1FVPROC)getProc("glUniform1fv");
 	glUniform1iv = (PFNGLUNIFORM1IVPROC)getProc("glUniform1iv");
@@ -120,7 +121,7 @@ DllExport(void) vmInit()
 	glVertexAttrib4f = (PFNGLVERTEXATTRIB4FPROC)getProc("glVertexAttrib4f");
 
 	glVertexAttrib4fv = (PFNGLVERTEXATTRIB4FVPROC)getProc("glVertexAttrib4fv");
-	glVertexAttrib4dv = (PFNGLVERTEXATTRIB4DVPROC)getProc("glVertexAttrib4dv");
+	glVertexAttribL4dv = (PFNGLVERTEXATTRIB4DVPROC)getProc("glVertexAttribL4dv");
 
 	glVertexAttrib4sv = (PFNGLVERTEXATTRIB4SVPROC)getProc("glVertexAttrib4sv");
 	glVertexAttrib4iv = (PFNGLVERTEXATTRIB4IVPROC)getProc("glVertexAttrib4iv");
@@ -1273,10 +1274,13 @@ DllExport(void) hglBindVertexAttributes(void** contextHandle, VertexInputBinding
 				switch (b.Type)
 				{
 					case GL_FLOAT:
-					case GL_DOUBLE:
 						glVertexAttribPointer(b.Index, b.Size, b.Type, 0, b.Stride, (void*)(size_t)b.Offset);
 						break;
 
+					case GL_DOUBLE:
+						glVertexAttribLPointer(b.Index, b.Size, b.Type, b.Stride, (void*)(size_t)b.Offset);
+						break;
+
 					case GL_BYTE:
 					case GL_UNSIGNED_BYTE:
 					case GL_SHORT:
@@ -1323,8 +1327,7 @@ DllExport(void) hglBindVertexAttributes(void** contextHandle, VertexInputBinding
 					break;
 
 				case GL_DOUBLE:
-					// Note: Even if input is double, we assume that shader wants float (hence no L)
-					glVertexAttrib4dv(b.Index, (GLdouble*)&b.Value);
+					glVertexAttribL4dv(b.Index, (GLdouble*)&b.Value);
 					break;
 
 				case GL_BYTE:
diff --git a/src/GLVM/glvm.h b/src/GLVM/glvm.h
@@ -51,6 +51,7 @@ static PFNGLSTENCILOPSEPARATEPROC						glStencilOpSeparate;
 static PFNGLPATCHPARAMETERIPROC							glPatchParameteri;
 static PFNGLDRAWARRAYSINSTANCEDPROC						glDrawArraysInstanced;
 static PFNGLVERTEXATTRIBPOINTERPROC						glVertexAttribPointer;
+static PFNGLVERTEXATTRIBLPOINTERPROC					glVertexAttribLPointer;
 static PFNGLVERTEXATTRIBIPOINTERPROC					glVertexAttribIPointer;
 static PFNGLUNIFORM1FVPROC								glUniform1fv;
 static PFNGLUNIFORM1IVPROC								glUniform1iv;
@@ -68,7 +69,7 @@ static PFNGLVERTEXATTRIB2FPROC							glVertexAttrib2f;
 static PFNGLVERTEXATTRIB3FPROC							glVertexAttrib3f;
 static PFNGLVERTEXATTRIB4FPROC							glVertexAttrib4f;
 static PFNGLVERTEXATTRIB4FVPROC							glVertexAttrib4fv;
-static PFNGLVERTEXATTRIB4DVPROC							glVertexAttrib4dv;
+static PFNGLVERTEXATTRIBL4DVPROC						glVertexAttribL4dv;
 static PFNGLVERTEXATTRIB4SVPROC							glVertexAttrib4sv;
 static PFNGLVERTEXATTRIB4IVPROC							glVertexAttrib4iv;
 static PFNGLVERTEXATTRIB4BVPROC							glVertexAttrib4bv;
diff --git a/src/Tests/Aardvark.Rendering.Tests/Tests/Buffer/Attributes.fs b/src/Tests/Aardvark.Rendering.Tests/Tests/Buffer/Attributes.fs
diff --git a/src/Tests/Aardvark.Rendering.Tests/Tests/Rendering/Uniforms.fs b/src/Tests/Aardvark.Rendering.Tests/Tests/Rendering/Uniforms.fs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+- Fixed support for 64-bit attributes and uniforms`
	`2`	`+`
`1`	`3`	`### 5.6.4`
`2`	`4`	`- [GL] Dispose MultimediaTimer in LodRenderer to avoid resource exhaustion`
`3`	`5`	`- [GL] Fixed M22f, M23f, M33f geometry attributes in LodRenderer`