Feature/469 open tk 5.x

Examples/Complete/ComputeFractal/Core/ComputeFractal.cs

@@ -104,7 +104,7 @@ public override void RenderAFrame()
 
             RWTexture.AsImage = true;
             RC.SetEffect(_computeShader);
-            RC.DispatchCompute(-1, RWTexture.Width / 16, RWTexture.Width / 16, 1);
+            RC.DispatchCompute(-1, (uint)(RWTexture.Width / 16), (uint)(RWTexture.Width / 16), 1);
             RC.MemoryBarrier();
             RWTexture.AsImage = false;
 

Examples/Complete/PointCloudPotree2/ImGui/PointCloudControlCore.cs

@@ -143,12 +143,7 @@ protected override ITextureHandle RenderAFrame()
             {
                 ReadyToLoadNewFile = true;
 
-                return new Engine.Imp.Graphics.Desktop.TextureHandle
-                {
-                    DepthRenderBufferHandle = -1,
-                    FrameBufferHandle = -1,
-                    TexHandle = -1
-                };
+                return new Engine.Imp.Graphics.Desktop.TextureHandle();
             }
 
             if (PtRenderingParams.Instance.EdlStrength != 0f)

src/Engine/Common/AttributeLocations.cs

@@ -8,56 +8,56 @@ public static class AttributeLocations
         /// <summary>
         /// The vertex attribute location index.
         /// </summary>
-        public static readonly int VertexAttribLocation = 0;
+        public static readonly uint VertexAttribLocation = 0;
 
         /// <summary>
         /// The color attribute location index.
         /// </summary>
-        public static readonly int ColorAttribLocation = 1;
+        public static readonly uint ColorAttribLocation = 1;
 
         /// <summary>
         /// The color attribute location index.
         /// </summary>
-        public static readonly int Color1AttribLocation = 2;
+        public static readonly uint Color1AttribLocation = 2;
 
         /// <summary>
         /// The color attribute location index.
         /// </summary>
-        public static readonly int Color2AttribLocation = 3;
+        public static readonly uint Color2AttribLocation = 3;
 
         /// <summary>
         /// The normal attribute location index.
         /// </summary>
-        public static readonly int NormalAttribLocation = 4;
+        public static readonly uint NormalAttribLocation = 4;
 
         /// <summary>
         /// The uv attribute location index.
         /// </summary>
-        public static readonly int UvAttribLocation = 5;
+        public static readonly uint UvAttribLocation = 5;
 
         /// <summary>
         /// The tangent attribute location index.
         /// </summary>
-        public static readonly int TangentAttribLocation = 6;
+        public static readonly uint TangentAttribLocation = 6;
 
         /// <summary>
         /// The bitangent attribute location index.
         /// </summary>
-        public static readonly int BitangentAttribLocation = 7;
+        public static readonly uint BitangentAttribLocation = 7;
 
         /// <summary>
         /// The bone weight attribute location index.
         /// </summary>
-        public static readonly int BoneWeightAttribLocation = 8;
+        public static readonly uint BoneWeightAttribLocation = 8;
 
         /// <summary>
         /// The bone index attribute location index.
         /// </summary>
-        public static readonly int BoneIndexAttribLocation = 9;
+        public static readonly uint BoneIndexAttribLocation = 9;
 
         /// <summary>
         /// The Fusee platform id attribute location index.
         /// </summary>
-        public static readonly int FuseePlatformIdLocation = 10;
+        public static readonly uint FuseePlatformIdLocation = 10;
     }
 }

src/Engine/Common/IRenderContextImp.cs

@@ -647,22 +647,14 @@ public interface IRenderContextImp
         /// <param name="threadGroupsX">The number of work groups to be launched in the X dimension.</param>
         /// <param name="threadGroupsY">The number of work groups to be launched in the Y dimension.</param>
         /// <param name="threadGroupsZ">he number of work groups to be launched in the Z dimension.</param>
-        void DispatchCompute(int kernelIndex, int threadGroupsX, int threadGroupsY, int threadGroupsZ);
+        void DispatchCompute(int kernelIndex, uint threadGroupsX, uint threadGroupsY, uint threadGroupsZ);
 
         /// <summary>
         /// Defines a barrier ordering memory transactions. At the moment it will insert all supported barriers.
         /// TODO: Define GLbitfield enum
         /// </summary>
         void MemoryBarrier();
 
-        /// <summary>
-        /// Draws a Debug Line in 3D Space by using a start and end point (float3).
-        /// </summary>
-        /// <param name="start">The start point of the DebugLine.</param>
-        /// <param name="end">The endpoint of the DebugLine.</param>
-        /// <param name="color">The color of the DebugLine.</param>
-        void DebugLine(float3 start, float3 end, float4 color);
-
         /// <summary>
         /// Gets the content of the buffer.
         /// </summary>

src/Engine/Common/IStorageBuffer.cs

@@ -26,6 +26,6 @@ public interface IStorageBuffer : IDisposable
         /// The binding index point the SSBO will be bound to.
         /// Caution: the binding point should not be hard coded in the shader code!
         /// </summary>
-        int BindingIndex { get; set; }
+        uint BindingIndex { get; set; }
     }
 }

src/Engine/Core/Effects/StorageBuffer.cs

@@ -13,7 +13,7 @@ public class StorageBuffer<T> : IStorageBuffer where T : struct
         /// The binding index point the SSBO will be bound to.
         /// Caution: the binding point should not be hard coded in the shader code!
         /// </summary>
-        public int BindingIndex { get; set; }
+        public uint BindingIndex { get; set; }
 
         /// <summary>
         /// Return the number of buffer elements.
@@ -56,7 +56,7 @@ public IBufferHandle BufferHandle
         /// <param name="count">The (fixed) count of buffer elements.</param>
         /// <param name="tSize">The size (byte) of one buffer element.</param>
         /// <param name="blockBindingIndex">Int that needs to be unique throughout the shader.</param>
-        public StorageBuffer(RenderCanvas rc, int count, int tSize, int blockBindingIndex)
+        public StorageBuffer(RenderCanvas rc, int count, int tSize, uint blockBindingIndex)
         {
             _count = count;
             _tSize = tSize;

src/Engine/Core/RenderContext.cs

@@ -1767,30 +1767,24 @@ public void MemoryBarrier()
         /// <param name="threadGroupsX">The number of work groups to be launched in the X dimension.</param>
         /// <param name="threadGroupsY">The number of work groups to be launched in the Y dimension.</param>
         /// <param name="threadGroupsZ">he number of work groups to be launched in the Z dimension.</param>
-        public void DispatchCompute(int kernelIndex, int threadGroupsX, int threadGroupsY, int threadGroupsZ)
+        public void DispatchCompute(int kernelIndex, uint threadGroupsX, uint threadGroupsY, uint threadGroupsZ)
         {
             if (_currentEffect == null) throw new NullReferenceException("No Compute Shader bound.");
             if (_currentEffect.GetType() != typeof(ComputeShader)) throw new NullReferenceException("Bound Effect isn't a Compute Shader.");
 
-            try
-            {
-                var cFx = GetCompiledFxForRenderMethod(true);
-                SetCompiledFx(cFx.GpuHandle);
-                SetRenderStateSet(_currentEffect.RendererStates);
-                SetGlobalParamsInCurrentFx(cFx);
-                UpdateAllActiveFxParams(cFx);
-
-                _rci.DispatchCompute(kernelIndex, threadGroupsX, threadGroupsY, threadGroupsZ);
-
-                // After rendering always cleanup pending meshes, textures and shader effects
-                _meshManager.Cleanup();
-                _textureManager.Cleanup();
-                _effectManager.Cleanup();
-            }
-            catch (Exception ex)
-            {
-                throw new Exception("Error while rendering pass ", ex);
-            }
+
+            var cFx = GetCompiledFxForRenderMethod(true);
+            SetCompiledFx(cFx.GpuHandle);
+            SetRenderStateSet(_currentEffect.RendererStates);
+            SetGlobalParamsInCurrentFx(cFx);
+            UpdateAllActiveFxParams(cFx);
+
+            _rci.DispatchCompute(kernelIndex, threadGroupsX, threadGroupsY, threadGroupsZ);
+
+            // After rendering always cleanup pending meshes, textures and shader effects
+            _meshManager.Cleanup();
+            _textureManager.Cleanup();
+            _effectManager.Cleanup();
         }
 
         /// <summary>

src/Engine/Imp/Graphics/Android/BufferHandle.cs

@@ -0,0 +1,28 @@
+using Fusee.Engine.Common;
+
+namespace Fusee.Engine.Imp.Graphics.Android
+{
+    /// <summary>
+    /// RenderBuffer for OpenGL, an integer value is used as a handle
+    /// </summary>
+    internal class RenderBufferHandle : IBufferHandle
+    {
+        internal int Handle = -1;
+    }
+
+    /// <summary>
+    /// FrameBuffer for OpenGL, an integer value is used as a handle
+    /// </summary>
+    internal class FrameBufferHandle : IBufferHandle
+    {
+        internal int Handle = -1;
+    }
+
+    /// <summary>
+    /// StorageBuffer for OpenGL, an integer value is used as a handle
+    /// </summary>
+    class StorageBufferHandle : IBufferHandle
+    {
+        internal int Handle = -1;
+    }
+}

src/Engine/Imp/Graphics/Shared/MeshImp.cs → src/Engine/Imp/Graphics/Android/MeshImp.cs

@@ -1,21 +1,7 @@
 using Fusee.Engine.Common;
 
-#if PLATFORM_DESKTOP
-
-namespace Fusee.Engine.Imp.Graphics.Desktop
-#elif PLATFORM_ANDROID
-
 namespace Fusee.Engine.Imp.Graphics.Android
-#endif
 {
-    /// <summary>
-    /// Contains a handle for any type of attribute buffer stored on GPU memory such as vertices, normals, uvs etc.
-    /// </summary>
-    public class AttributeImp : IAttribImp
-    {
-        internal int AttributeBufferObject;
-    }
-
     /// <summary>
     /// This is the implementation of the <see cref="IMeshImp" /> interface.
     /// It is used to check the status of the informations of a mesh and flush informations if required.

src/Engine/Imp/Graphics/Android/RenderContextImp.cs

@@ -640,16 +640,16 @@ public IShaderHandle CreateShaderProgram(string vs, string ps, string gs = null)
             GL.AttachShader(program, vertexObject);
 
             // enable GLSL (ES) shaders to use fuVertex, fuColor and fuNormal attributes
-            GL.BindAttribLocation(program, AttributeLocations.VertexAttribLocation, UniformNameDeclarations.Vertex);
-            GL.BindAttribLocation(program, AttributeLocations.ColorAttribLocation, UniformNameDeclarations.VertexColor);
-            GL.BindAttribLocation(program, AttributeLocations.Color1AttribLocation, UniformNameDeclarations.VertexColor1);
-            GL.BindAttribLocation(program, AttributeLocations.Color2AttribLocation, UniformNameDeclarations.VertexColor2);
-            GL.BindAttribLocation(program, AttributeLocations.UvAttribLocation, UniformNameDeclarations.TextureCoordinates);
-            GL.BindAttribLocation(program, AttributeLocations.NormalAttribLocation, UniformNameDeclarations.Normal);
-            GL.BindAttribLocation(program, AttributeLocations.TangentAttribLocation, UniformNameDeclarations.Tangent);
-            GL.BindAttribLocation(program, AttributeLocations.BoneIndexAttribLocation, UniformNameDeclarations.BoneIndex);
-            GL.BindAttribLocation(program, AttributeLocations.BoneWeightAttribLocation, UniformNameDeclarations.BoneWeight);
-            GL.BindAttribLocation(program, AttributeLocations.BitangentAttribLocation, UniformNameDeclarations.Bitangent);
+            GL.BindAttribLocation(program, (int)AttributeLocations.VertexAttribLocation, UniformNameDeclarations.Vertex);
+            GL.BindAttribLocation(program, (int)AttributeLocations.ColorAttribLocation, UniformNameDeclarations.VertexColor);
+            GL.BindAttribLocation(program, (int)AttributeLocations.Color1AttribLocation, UniformNameDeclarations.VertexColor1);
+            GL.BindAttribLocation(program, (int)AttributeLocations.Color2AttribLocation, UniformNameDeclarations.VertexColor2);
+            GL.BindAttribLocation(program, (int)AttributeLocations.UvAttribLocation, UniformNameDeclarations.TextureCoordinates);
+            GL.BindAttribLocation(program, (int)AttributeLocations.NormalAttribLocation, UniformNameDeclarations.Normal);
+            GL.BindAttribLocation(program, (int)AttributeLocations.TangentAttribLocation, UniformNameDeclarations.Tangent);
+            GL.BindAttribLocation(program, (int)AttributeLocations.BoneIndexAttribLocation, UniformNameDeclarations.BoneIndex);
+            GL.BindAttribLocation(program, (int)AttributeLocations.BoneWeightAttribLocation, UniformNameDeclarations.BoneWeight);
+            GL.BindAttribLocation(program, (int)AttributeLocations.BitangentAttribLocation, UniformNameDeclarations.Bitangent);
 
             GL.LinkProgram(program);
             return new ShaderHandleImp { Handle = program };
@@ -1688,7 +1688,7 @@ public void MemoryBarrier()
         /// <param name="threadGroupsX">The number of work groups to be launched in the X dimension.</param>
         /// <param name="threadGroupsY">The number of work groups to be launched in the Y dimension.</param>
         /// <param name="threadGroupsZ">he number of work groups to be launched in the Z dimension.</param>
-        public void DispatchCompute(int kernelIndex, int threadGroupsX, int threadGroupsY, int threadGroupsZ)
+        public void DispatchCompute(int kernelIndex, uint threadGroupsX, uint threadGroupsY, uint threadGroupsZ)
         {
             GL.DispatchCompute(threadGroupsX, threadGroupsY, threadGroupsZ);
         }

src/Engine/Imp/Graphics/Shared/ShaderHandleImp.cs → src/Engine/Imp/Graphics/Android/ShaderHandleImp.cs

@@ -1,10 +1,6 @@
 using Fusee.Engine.Common;
 
-#if PLATFORM_DESKTOP
-namespace Fusee.Engine.Imp.Graphics.Desktop
-#elif PLATFORM_ANDROID
 namespace Fusee.Engine.Imp.Graphics.Android
-#endif
 {
     /// <summary>
     /// Implementation of <see cref="IShaderHandle" /> for usage with OpenTK framework.

src/Engine/Imp/Graphics/Shared/TextureHandle.cs → src/Engine/Imp/Graphics/Android/TextureHandle.cs

@@ -1,13 +1,9 @@
 using Fusee.Engine.Common;
 
-#if PLATFORM_DESKTOP
-namespace Fusee.Engine.Imp.Graphics.Desktop
-#elif PLATFORM_ANDROID
 namespace Fusee.Engine.Imp.Graphics.Android
-#endif
 {
     /// <summary>
-    /// Texture Implementation for OpenTK, an integer value is used as a handle
+    /// Texture Implementation for OpenGL, an integer value is used as a handle
     /// </summary>
     public class TextureHandle : ITextureHandle
     {

src/Engine/Imp/Graphics/Blazor/RenderContextImp.cs

@@ -2650,7 +2650,7 @@ public void ConnectBufferToShaderStorage(IShaderHandle currentProgram, IStorageB
         /// <param name="threadGroupsY"></param>
         /// <param name="threadGroupsZ"></param>
         /// <exception cref="NotImplementedException"></exception>
-        public void DispatchCompute(int kernelIndex, int threadGroupsX, int threadGroupsY, int threadGroupsZ)
+        public void DispatchCompute(int kernelIndex, uint threadGroupsX, uint threadGroupsY, uint threadGroupsZ)
         {
             throw new NotImplementedException();
         }

src/Engine/Imp/Graphics/Blazor/ShaderHandleImp.cs

@@ -0,0 +1,13 @@
+using Fusee.Engine.Common;
+
+namespace Fusee.Engine.Imp.Graphics.Blazor
+{
+    /// <summary>
+    /// Implementation of the <see cref="IShaderHandle"/>
+    /// This object is passed to WebGL and represents a shader program
+    /// </summary>
+    public class ShaderHandleImp : IShaderHandle
+    {
+        internal WebGLProgram Handle;
+    }
+}

src/Engine/Imp/Graphics/Blazor/ShaderParam.cs

@@ -10,13 +10,4 @@ public class ShaderParam : IShaderParam
     {
         internal WebGLUniformLocation handle;
     }
-
-    /// <summary>
-    /// Implementation of the <see cref="IShaderHandle"/>
-    /// This object is passed to WebGL and represents a shader program
-    /// </summary>
-    public class ShaderHandleImp : IShaderHandle
-    {
-        internal WebGLProgram Handle;
-    }
 }

src/Engine/Imp/Graphics/Desktop/AttributeImp.cs

@@ -0,0 +1,13 @@
+using Fusee.Engine.Common;
+using OpenTK.Graphics;
+
+namespace Fusee.Engine.Imp.Graphics.Desktop
+{
+    /// <summary>
+    /// Contains a handle for any type of attribute buffer stored on GPU memory such as vertices, normals, uvs etc.
+    /// </summary>
+    public class AttributeImp : IAttribImp
+    {
+        internal BufferHandle AttributeBufferObject;
+    }
+}

src/Engine/Imp/Graphics/Shared/BufferHandle.cs → src/Engine/Imp/Graphics/Desktop/BufferHandle.cs

@@ -1,29 +1,26 @@
 using Fusee.Engine.Common;
+using OpenTK.Graphics;
 
-#if PLATFORM_DESKTOP
 namespace Fusee.Engine.Imp.Graphics.Desktop
-#elif PLATFORM_ANDROID
-namespace Fusee.Engine.Imp.Graphics.Android
-#endif
 {
     /// <summary>
     /// RenderBuffer for OpenTK, an integer value is used as a handle
     /// </summary>
     public class RenderBufferHandle : IBufferHandle
     {
-        internal int Handle = -1;
+        internal RenderbufferHandle Handle = new(-1);
     }
 
     /// <summary>
     /// FrameBuffer for OpenTK, an integer value is used as a handle
     /// </summary>
     class FrameBufferHandle : IBufferHandle
     {
-        internal int Handle = -1;
+        internal FramebufferHandle Handle = new(-1);
     }
 
     class StorageBufferHandle : IBufferHandle
     {
-        internal int Handle = -1;
+        internal BufferHandle Handle = new(-1);
     }
 }