Merge remote-tracking branch 'origin/master' into ImPlot_ImNodes_ImGuizmo_Integration

Author: mellinoe

src/CodeGenerator/TypeInfo.cs

@@ -138,7 +138,9 @@ public class TypeInfo
         public static readonly HashSet<string> SkippedFunctions = new HashSet<string>()
         {
             "igInputText",
-            "igInputTextMultiline"
+            "igInputTextMultiline",
+            "igCalcTextSize",
+            "igInputTextWithHint"
         };
     }
 }

src/ImGui.NET.SampleProgram/ImGuiController.cs

@@ -99,8 +99,8 @@ public void CreateDeviceResources(GraphicsDevice gd, OutputDescription outputDes
 
             byte[] vertexShaderBytes = LoadEmbeddedShaderCode(gd.ResourceFactory, "imgui-vertex", ShaderStages.Vertex);
             byte[] fragmentShaderBytes = LoadEmbeddedShaderCode(gd.ResourceFactory, "imgui-frag", ShaderStages.Fragment);
-            _vertexShader = factory.CreateShader(new ShaderDescription(ShaderStages.Vertex, vertexShaderBytes, "VS"));
-            _fragmentShader = factory.CreateShader(new ShaderDescription(ShaderStages.Fragment, fragmentShaderBytes, "FS"));
+            _vertexShader = factory.CreateShader(new ShaderDescription(ShaderStages.Vertex, vertexShaderBytes, gd.BackendType == GraphicsBackend.Metal ? "VS" : "main"));
+            _fragmentShader = factory.CreateShader(new ShaderDescription(ShaderStages.Fragment, fragmentShaderBytes, gd.BackendType == GraphicsBackend.Metal ? "FS" : "main"));
 
             VertexLayoutDescription[] vertexLayouts = new VertexLayoutDescription[]
             {
@@ -123,7 +123,8 @@ public void CreateDeviceResources(GraphicsDevice gd, OutputDescription outputDes
                 PrimitiveTopology.TriangleList,
                 new ShaderSetDescription(vertexLayouts, new[] { _vertexShader, _fragmentShader }),
                 new ResourceLayout[] { _layout, _textureLayout },
-                outputDescription);
+                outputDescription,
+                ResourceBindingModel.Default);
             _pipeline = factory.CreateGraphicsPipeline(ref pd);
 
             _mainResourceSet = factory.CreateResourceSet(new ResourceSetDescription(_layout,

src/ImGui.NET.SampleProgram/Program.cs

@@ -38,7 +38,7 @@ static void Main(string[] args)
             // Create window, GraphicsDevice, and all resources necessary for the demo.
             VeldridStartup.CreateWindowAndGraphicsDevice(
                 new WindowCreateInfo(50, 50, 1280, 720, WindowState.Normal, "ImGui.NET Sample Program"),
-                new GraphicsDeviceOptions(true, null, true),
+                new GraphicsDeviceOptions(true, null, true, ResourceBindingModel.Improved, true, true),
                 out _window,
                 out _gd);
             _window.Resized += () =>

src/ImGui.NET.SampleProgram/Shaders/SPIR-V/imgui-frag.glsl

@@ -13,4 +13,4 @@ layout (location = 0) out vec4 outputColor;
 void main()
 {
     outputColor = color * texture(sampler2D(FontTexture, FontSampler), texCoord);
-}
+}

src/ImGui.NET.SampleProgram/Shaders/SPIR-V/imgui-frag.spv

@@ -3,27 +3,26 @@
 #extension GL_ARB_separate_shader_objects : enable
 #extension GL_ARB_shading_language_420pack : enable
 
-layout (location = 0) in vec2 vsin_position;
-layout (location = 1) in vec2 vsin_texCoord;
-layout (location = 2) in vec4 vsin_color;
+layout (location = 0) in vec2 in_position;
+layout (location = 1) in vec2 in_texCoord;
+layout (location = 2) in vec4 in_color;
 
-layout (binding = 0) uniform Projection
+layout (binding = 0) uniform ProjectionMatrixBuffer
 {
-    mat4 projection;
+    mat4 projection_matrix;
 };
 
-layout (location = 0) out vec4 vsout_color;
-layout (location = 1) out vec2 vsout_texCoord;
+layout (location = 0) out vec4 color;
+layout (location = 1) out vec2 texCoord;
 
-out gl_PerVertex 
+out gl_PerVertex
 {
     vec4 gl_Position;
 };
 
 void main() 
 {
-    gl_Position = projection * vec4(vsin_position, 0, 1);
-    vsout_color = vsin_color;
-    vsout_texCoord = vsin_texCoord;
-    gl_Position.y = -gl_Position.y;
+    gl_Position = projection_matrix * vec4(in_position, 0, 1);
+    color = in_color;
+    texCoord = in_texCoord;
 }