Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/master' into font-rework
Browse files Browse the repository at this point in the history 
# Conflicts:
#	RELEASE_NOTES.md
  • Loading branch information
@haraldsteinlechner
haraldsteinlechner committed Dec 21, 2023
2 parents 1b252b5 + dba41a0 commit c28d488
Show file tree
Hide file tree
Showing 51 changed files with 1,387 additions and 975 deletions.
20 changes: 19 additions & 1 deletion RELEASE_NOTES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,25 @@

### 5.4.10-prerelease0001
- [Text] improved Font resolver for Windows and MacOS
- [PathSegment] fixed several PathSegment tools and added a few new ones
- [PathSegment] fixed several PathSegment tools and added a few new ones### 5.4.7
- Fixed Frustum.withAspect and Frustum.withHorizontalFieldOfViewInDegrees
- [GL] Fixed InvalidEnum error due to GL_POINT_SPRITE
- [GL] Removed validation via proxy textures (resulted in errors on AMD with multisampled textures)
- [GL] Removed swizzle for multisampled textures (not supported)
- [GL] Added simple parameter device limit checks for textures and renderbuffers
- [GL] Improved texture memory usage tracking
- [GL] Made retrieval of program binaries more robust
- [GL] Improved driver information and error formatting
- [GL] Disabled Dispose() for Program
- [GL] Fixed resource leaks in ContextHandleOpenTK.create
- [GL] Fixed ComputeCommand.SetBufferCmd
- [GL] Fixed issue with texture targets and multisampling
- [Vulkan] Fixed swapchain creation if maxImages is zero
- [Vulkan] Fixed issue with image format queries and external memory
- [Vulkan] Improved error formatting
- [GLFW] Use no error context only when indicated by debug config
- Added IRenderTask.GetRuntime() and IRenderTask.GetFramebufferSignature()


### 5.4.6
- [ContextHandles] GL.Enable(EnableCap.PointSprite)
Expand Down
9 changes: 4 additions & 5 deletions paket.dependencies
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
framework: auto-detect
source https://api.nuget.org/v3/index.json
source https://vrvis.myget.org/F/aardvark_public/api/v2

storage: none

nuget FSharp.Core >= 5.0.1 lowest_matching: true
nuget Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0 lowest_matching: true
nuget Aardvark.Build ~> 1.0.18
nuget Aardvark.Build ~> 1.0.21

nuget FSharp.Data.Adaptive ~> 1.2.13
nuget CSharp.Data.Adaptive ~> 1.2.13
Expand All @@ -23,9 +22,9 @@ nuget Aardvark.Base.Tensors ~> 5.2.27

nuget Aardvark.Assembler ~> 0.0.8

nuget FShade.Core ~> 5.5.0
nuget FShade ~> 5.5.0
nuget FShade.Debug ~> 5.5.0
nuget FShade.Core ~> 5.5.3
nuget FShade ~> 5.5.3
nuget FShade.Debug ~> 5.5.3

nuget Unofficial.OpenVR ~> 1.1.0
nuget Unofficial.Typography ~> 0.1.0
Expand Down
82 changes: 41 additions & 41 deletions paket.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,53 +10,53 @@ NUGET
Aardvark.Base.Runtime (>= 5.2.7 < 5.3)
FSharp.Core (>= 5.0)
FSharp.Data.Adaptive (>= 1.2.13 < 1.3)
Aardvark.Base (5.2.27)
Aardvark.Base.Telemetry (5.2.27)
Aardvark.Base (5.2.28)
Aardvark.Base.Telemetry (5.2.28)
System.Collections.Immutable (>= 5.0)
System.Reflection.Metadata (>= 5.0) - restriction: || (== net471) (&& (== net6.0) (< netcoreapp3.1)) (&& (== net6.0-windows7.0) (< netcoreapp3.1)) (== netstandard2.0)
System.Text.Json (>= 4.7.2)
Aardvark.Base.Essentials (5.2.27)
Aardvark.Base (5.2.27)
Aardvark.Base.Essentials (5.2.28)
Aardvark.Base (5.2.28)
System.Collections.Immutable (>= 5.0)
Aardvark.Base.FSharp (5.2.27)
Aardvark.Base (5.2.27)
Aardvark.Base.FSharp (5.2.28)
Aardvark.Base (5.2.28)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 5.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
FsPickler (>= 5.3.2 < 5.4)
System.Dynamic.Runtime (>= 4.3 < 4.4)
Aardvark.Base.Incremental (5.2.27)
Aardvark.Base (5.2.27)
Aardvark.Base.FSharp (5.2.27)
Aardvark.Base.Incremental (5.2.28)
Aardvark.Base (5.2.28)
Aardvark.Base.FSharp (5.2.28)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 5.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
FsPickler (>= 5.3.2 < 5.4)
Aardvark.Base.IO (5.2.27)
Aardvark.Base (5.2.27)
Aardvark.Base.Tensors (5.2.27)
Aardvark.Base.IO (5.2.28)
Aardvark.Base (5.2.28)
Aardvark.Base.Tensors (5.2.28)
System.Dynamic.Runtime (>= 4.3 < 4.4)
Aardvark.Base.Runtime (5.2.27)
Aardvark.Base.FSharp (5.2.27)
Aardvark.Base.Incremental (5.2.27)
Aardvark.Base.Runtime (5.2.28)
Aardvark.Base.FSharp (5.2.28)
Aardvark.Base.Incremental (5.2.28)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 5.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
FsPickler (>= 5.3.2 < 5.4)
Aardvark.Base.Telemetry (5.2.27)
Aardvark.Base.Tensors (5.2.27)
Aardvark.Base (5.2.27)
Aardvark.Base.FSharp (5.2.27)
Aardvark.Base.Telemetry (5.2.28)
Aardvark.Base.Tensors (5.2.28)
Aardvark.Base (5.2.28)
Aardvark.Base.FSharp (5.2.28)
FSharp.Core (>= 5.0)
SixLabors.ImageSharp (>= 2.1.3 < 2.2)
Aardvark.Base.TypeProviders (4.5.15)
FSharp.Core (>= 3.1.2.5) - restriction: || (== net471) (&& (== net6.0) (>= net45)) (&& (== net6.0-windows7.0) (>= net45)) (&& (== netstandard2.0) (>= net45))
FSharp.Core (>= 4.2.3) - restriction: || (&& (== net471) (< net45)) (== net6.0) (== net6.0-windows7.0) (== netstandard2.0)
Aardvark.Build (1.0.19)
Aardvark.Geometry (5.2.27)
Aardvark.Base (5.2.27)
Aardvark.Base.FSharp (5.2.27)
Aardvark.Base.Tensors (5.2.27)
Aardvark.Build (1.0.21)
Aardvark.Geometry (5.2.28)
Aardvark.Base (5.2.28)
Aardvark.Base.FSharp (5.2.28)
Aardvark.Base.Tensors (5.2.28)
Aardvark.Base.TypeProviders (>= 4.5.15 < 4.6)
FSharp.Core (>= 5.0)
FSharp.Data.Adaptive (>= 1.2 < 1.3)
Expand All @@ -69,38 +69,38 @@ NUGET
FSharp.Core (>= 4.7)
FSharp.Data.Adaptive (1.2.14)
System.Reflection.Emit.Lightweight (>= 4.6)
FShade (5.5)
FShade.Core (5.5)
FShade.GLSL (5.5)
FShade.Imperative (5.5)
FShade.SpirV (5.5)
FShade.Core (5.5)
FShade (5.5.3)
FShade.Core (5.5.3)
FShade.GLSL (5.5.3)
FShade.Imperative (5.5.3)
FShade.SpirV (5.5.3)
FShade.Core (5.5.3)
Aardvark.Base (>= 5.2.19 < 5.3)
Aardvark.Base.FSharp (>= 5.2.19 < 5.3)
FShade.Imperative (5.5)
FShade.Imperative (5.5.3)
FSharp.Core (>= 5.0)
FShade.Debug (5.5)
FShade.Debug (5.5.3)
Aardvark.Base (>= 5.2.19 < 5.3)
Aardvark.Base.FSharp (>= 5.2.19 < 5.3)
FShade.Core (5.5)
FShade.Imperative (5.5)
FShade.Core (5.5.3)
FShade.Imperative (5.5.3)
FSharp.Core (>= 5.0)
FShade.GLSL (5.5)
FShade.GLSL (5.5.3)
Aardvark.Base (>= 5.2.19 < 5.3)
Aardvark.Base.FSharp (>= 5.2.19 < 5.3)
FShade.Core (5.5)
FShade.Imperative (5.5)
FShade.Core (5.5.3)
FShade.Imperative (5.5.3)
FSharp.Core (>= 5.0)
FShade.Imperative (5.5)
FShade.Imperative (5.5.3)
Aardvark.Base (>= 5.2.19 < 5.3)
Aardvark.Base.FSharp (>= 5.2.19 < 5.3)
FSharp.Core (>= 5.0)
FsPickler (>= 5.3.2 < 5.4)
FShade.SpirV (5.5)
FShade.SpirV (5.5.3)
Aardvark.Base (>= 5.2.19 < 5.3)
Aardvark.Base.FSharp (>= 5.2.19 < 5.3)
FShade.Core (5.5)
FShade.Imperative (5.5)
FShade.Core (5.5.3)
FShade.Imperative (5.5.3)
FSharp.Core (>= 5.0)
FSharp.Core (5.0.1)
FSharp.Data (4.2.10)
Expand Down
3 changes: 2 additions & 1 deletion src/Aardvark.Rendering.GL/Aardvark.Rendering.GL.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@
<Compile Include="Instructions\Translations.fs" />
<Compile Include="Resources\PixelBuffer.fs" />
<Compile Include="Resources\Textures\PixelTransfer.fs" />
<Compile Include="Resources\Textures\Renderbuffer.fs" />
<Compile Include="Resources\Textures\Texture.fs" />
<Compile Include="Resources\Textures\Renderbuffer.fs" />
<Compile Include="Resources\Textures\Image.fs" />
<Compile Include="Resources\Textures\TextureSharing.fs" />
<Compile Include="Resources\Textures\TextureCopy.fs" />
<Compile Include="Resources\Textures\TextureUpload.fs" />
Expand Down
45 changes: 45 additions & 0 deletions src/Aardvark.Rendering.GL/Core/Context.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,22 @@ type Context(runtime : IRuntime, createContext : unit -> ContextHandle) as this

let mutable unpackAlignment : Option<int> = None

let mutable maxTextureSize : Option<V2i> = None

let mutable maxTextureSize3d : Option<V3i> = None

let mutable maxTextureSizeCube : Option<int> = None

let mutable maxTextureArrayLayers : Option<int> = None

let mutable maxRenderbufferSize : Option<V2i> = None

let mutable maxComputeWorkGroupSize : Option<V3i> = None

let mutable maxComputeWorkGroupInvocations : Option<int> = None

let mutable numProgramBinaryFormats : Option<int> = None

let mutable shaderCachePath : Option<string> = Some defaultShaderCachePath

let formatSampleCounts = FastConcurrentDict()
Expand Down Expand Up @@ -259,6 +271,34 @@ type Context(runtime : IRuntime, createContext : unit -> ContextHandle) as this
GL.GetInteger(GetPName.UnpackAlignment)
)

member x.MaxTextureSize =
getOrQuery &maxTextureSize (fun _ ->
let s = GL.GetInteger(GetPName.MaxTextureSize)
V2i s
)

member x.MaxTextureSize3D =
getOrQuery &maxTextureSize3d (fun _ ->
let s = GL.GetInteger(GetPName.Max3DTextureSize)
V3i s
)

member x.MaxTextureSizeCube =
getOrQuery &maxTextureSizeCube (fun _ ->
GL.GetInteger(GetPName.MaxCubeMapTextureSize)
)

member x.MaxTextureArrayLayers =
getOrQuery &maxTextureArrayLayers (fun _ ->
GL.GetInteger(GetPName.MaxArrayTextureLayers)
)

member x.MaxRenderbufferSize =
getOrQuery &maxRenderbufferSize (fun _ ->
let s = GL.GetInteger(GetPName.MaxRenderbufferSize)
V2i s
)

member x.MaxComputeWorkGroupSize =
getOrQuery &maxComputeWorkGroupSize (fun _ ->
let mutable res = V3i.Zero
Expand All @@ -273,6 +313,11 @@ type Context(runtime : IRuntime, createContext : unit -> ContextHandle) as this
GL.GetInteger(GetPName.MaxComputeWorkGroupInvocations)
)

member x.NumProgramBinaryFormats =
getOrQuery &numProgramBinaryFormats (fun _ ->
GL.GetInteger(GetPName.NumProgramBinaryFormats)
)

member internal x.ImportMemoryBlock(external : ExternalMemoryBlock) =
sharedMemoryManager.Import external

Expand Down
Loading

0 comments on commit c28d488

Please sign in to comment.