Merge branch 'autorefactor'

.editorconfig

@@ -1,40 +1,203 @@
-; This file is for unifying the coding style for different editors and IDEs.
-; More information at http://EditorConfig.org
-
+# EditorConfig is awesome: http://editorconfig.org
 root = true
 
-[*]
-end_of_line = CRLF
+[*.{csproj,props,targets}]
+charset = utf-8-bom
+end_of_line = crlf
 insert_final_newline = true
-trim_trailing_whitespace = true
 indent_style = space
-
-# Xml project files
-[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,props,targets}]
 indent_size = 2
+trim_trailing_whitespace = true
+
+[g_*.cs]
+generated_code = true
 
 [*.cs]
+end_of_line = crlf
+insert_final_newline = true
+indent_style = space
 indent_size = 4
+trim_trailing_whitespace = true
 
-# Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = false:suggestion
-dotnet_style_qualification_for_property = false:suggestion
-dotnet_style_qualification_for_method = false:suggestion
-dotnet_style_qualification_for_event = false:suggestion
+#license header
+file_header_template = Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.\nSee the LICENCE file in the repository root for full licence text.
 
-# Use language keywords instead of framework type names for type references
-dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
-dotnet_style_predefined_type_for_member_access = true:suggestion
+#Roslyn naming styles
 
-# Don't use "var"
-csharp_style_var_for_built_in_types = false:suggestion
-csharp_style_var_when_type_is_apparent = false:suggestion
-csharp_style_var_elsewhere = false:suggestion
+#PascalCase for public and protected members
+dotnet_naming_style.pascalcase.capitalization = pascal_case
+dotnet_naming_symbols.public_members.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.public_members_pascalcase.severity = error
+dotnet_naming_rule.public_members_pascalcase.symbols = public_members
+dotnet_naming_rule.public_members_pascalcase.style = pascalcase
 
-# Newline settings
-csharp_new_line_before_open_brace = all
-csharp_new_line_before_else = true
+#camelCase for private members
+dotnet_naming_style.camelcase.capitalization = camel_case
+
+dotnet_naming_symbols.private_members.applicable_accessibilities = private
+dotnet_naming_symbols.private_members.applicable_kinds = property,method,field,event
+dotnet_naming_rule.private_members_camelcase.severity = warning
+dotnet_naming_rule.private_members_camelcase.symbols = private_members
+dotnet_naming_rule.private_members_camelcase.style = camelcase
+
+dotnet_naming_symbols.local_function.applicable_kinds = local_function
+dotnet_naming_rule.local_function_camelcase.severity = warning
+dotnet_naming_rule.local_function_camelcase.symbols = local_function
+dotnet_naming_rule.local_function_camelcase.style = camelcase
+
+#all_lower for private and local constants/static readonlys
+dotnet_naming_style.all_lower.capitalization = all_lower
+dotnet_naming_style.all_lower.word_separator = _
+
+dotnet_naming_symbols.private_constants.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants.required_modifiers = const
+dotnet_naming_symbols.private_constants.applicable_kinds = field
+dotnet_naming_rule.private_const_all_lower.severity = warning
+dotnet_naming_rule.private_const_all_lower.symbols = private_constants
+dotnet_naming_rule.private_const_all_lower.style = all_lower
+
+dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
+dotnet_naming_rule.private_static_readonly_all_lower.severity = warning
+dotnet_naming_rule.private_static_readonly_all_lower.symbols = private_static_readonly
+dotnet_naming_rule.private_static_readonly_all_lower.style = all_lower
+
+dotnet_naming_symbols.local_constants.applicable_kinds = local
+dotnet_naming_symbols.local_constants.required_modifiers = const
+dotnet_naming_rule.local_const_all_lower.severity = warning
+dotnet_naming_rule.local_const_all_lower.symbols = local_constants
+dotnet_naming_rule.local_const_all_lower.style = all_lower
+
+#ALL_UPPER for non private constants/static readonlys
+dotnet_naming_style.all_upper.capitalization = all_upper
+dotnet_naming_style.all_upper.word_separator = _
+
+dotnet_naming_symbols.public_constants.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_constants.required_modifiers = const
+dotnet_naming_symbols.public_constants.applicable_kinds = field
+dotnet_naming_rule.public_const_all_upper.severity = warning
+dotnet_naming_rule.public_const_all_upper.symbols = public_constants
+dotnet_naming_rule.public_const_all_upper.style = all_upper
+
+dotnet_naming_symbols.public_static_readonly.applicable_accessibilities = public,internal,protected,protected_internal,private_protected
+dotnet_naming_symbols.public_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.public_static_readonly.applicable_kinds = field
+dotnet_naming_rule.public_static_readonly_all_upper.severity = warning
+dotnet_naming_rule.public_static_readonly_all_upper.symbols = public_static_readonly
+dotnet_naming_rule.public_static_readonly_all_upper.style = all_upper
+
+#Roslyn formating options
+
+#Formatting - indentation options
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+#Formatting - new line options
 csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
 csharp_new_line_before_finally = true
-csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_open_brace = all
+#csharp_new_line_before_members_in_anonymous_types = true
+#csharp_new_line_before_members_in_object_initializers = true # Currently no effect in VS/dotnet format (16.4), and makes Rider confusing
+csharp_new_line_between_query_expression_clauses = true
+
+#Formatting - organize using options
+dotnet_sort_system_directives_first = true
+
+#Formatting - spacing options
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+
+#Formatting - wrapping options
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#Roslyn language styles
+
+#Style - this. qualification
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning
+
+#Style - type names
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+csharp_style_var_when_type_is_apparent = true:none
+csharp_style_var_for_built_in_types = false:warning
+csharp_style_var_elsewhere = true:silent
+
+#Style - modifiers
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+csharp_preferred_modifier_order = public,private,protected,internal,new,abstract,virtual,sealed,override,static,readonly,extern,unsafe,volatile,async:warning
+
+#Style - parentheses
+# Skipped because roslyn cannot separate +-*/ with << >>
+
+#Style - expression bodies
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_local_functions = true:silent
+
+#Style - expression preferences
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_compound_assignment = true:warning
+
+#Style - null/type checks
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
+csharp_style_throw_expression = true:silent
+csharp_style_conditional_delegate_call = true:warning
+
+#Style - unused
+dotnet_style_readonly_field = true:silent
+dotnet_code_quality_unused_parameters = non_public:silent
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+
+#Style - variable declaration
+csharp_style_inlined_variable_declaration = true:warning
+csharp_style_deconstructed_variable_declaration = true:warning
+
+#Style - other C# 7.x features
+dotnet_style_prefer_inferred_tuple_names = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_pattern_local_over_anonymous_function = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+
+#Style - C# 8 features
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:silent
+csharp_style_prefer_index_operator = true:warning
+csharp_style_prefer_range_operator = true:warning
+csharp_style_prefer_switch_expression = false:none
+
+csharp_style_namespace_declarations = block_scoped:warning
+
+[*.{yaml,yml}]
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true

Directory.Build.props

@@ -23,12 +23,6 @@
     <RepositoryUrl>https://github.com/ppy/veldrid</RepositoryUrl>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <IsWindows Condition="'$(OS)' == 'Windows_NT'">true</IsWindows>
-    <IsMacOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsMacOS>
-    <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
-  </PropertyGroup>
-
   <PropertyGroup>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>

src/Veldrid.MetalBindings/Blocks.cs

@@ -9,9 +9,9 @@ public unsafe struct BlockLiteral
         public int reserved;
         public IntPtr invoke;
         public BlockDescriptor* descriptor;
-    };
+    }
 
-    public unsafe struct BlockDescriptor
+    public struct BlockDescriptor
     {
         public ulong reserved;
         public ulong Block_size;

src/Veldrid.MetalBindings/CAMetalLayer.cs

@@ -1,5 +1,5 @@
-using static Veldrid.MetalBindings.ObjectiveCRuntime;
 using System;
+using static Veldrid.MetalBindings.ObjectiveCRuntime;
 
 namespace Veldrid.MetalBindings
 {

src/Veldrid.MetalBindings/CGFloat.cs

@@ -1,11 +1,8 @@
-using System;
-using System.Runtime.CompilerServices;
-
 namespace Veldrid.MetalBindings
 {
     // TODO: Technically this should be "pointer-sized",
     // but there are no non-64-bit platforms that anyone cares about.
-    public unsafe struct CGFloat
+    public struct CGFloat
     {
         private readonly double _value;
 
@@ -24,4 +21,4 @@ public double Value
 
         public override string ToString() => _value.ToString();
     }
-}
+}

src/Veldrid.MetalBindings/CGSize.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Runtime.CompilerServices;
-
 namespace Veldrid.MetalBindings
 {
     public struct CGSize
@@ -16,4 +13,4 @@ public CGSize(double width, double height)
 
         public override string ToString() => string.Format("{0} x {1}", width, height);
     }
-}
+}

src/Veldrid.MetalBindings/MTLCommandBuffer.cs

@@ -1,6 +1,6 @@
-using static Veldrid.MetalBindings.ObjectiveCRuntime;
 using System;
 using System.Runtime.InteropServices;
+using static Veldrid.MetalBindings.ObjectiveCRuntime;
 
 namespace Veldrid.MetalBindings
 {
@@ -43,4 +43,4 @@ public void addCompletedHandler(IntPtr block)
         private static readonly Selector sel_addCompletedHandler = "addCompletedHandler:";
         private static readonly Selector sel_status = "status";
     }
-}
+}

src/Veldrid.MetalBindings/MTLDevice.cs

@@ -21,10 +21,8 @@ public MTLSize maxThreadsPerThreadgroup
                 {
                     return objc_msgSend_stret<MTLSize>(this, sel_maxThreadsPerThreadgroup);
                 }
-                else
-                {
-                    return MTLSize_objc_msgSend(this, sel_maxThreadsPerThreadgroup);
-                }
+
+                return MTLSize_objc_msgSend(this, sel_maxThreadsPerThreadgroup);
             }
         }
 

src/Veldrid.MetalBindings/MTLFunction.cs

@@ -1,5 +1,5 @@
-using static Veldrid.MetalBindings.ObjectiveCRuntime;
 using System;
+using static Veldrid.MetalBindings.ObjectiveCRuntime;
 
 namespace Veldrid.MetalBindings
 {

src/Veldrid.MetalBindings/MTLOrigin.cs

@@ -10,9 +10,9 @@ public struct MTLOrigin
 
         public MTLOrigin(uint x, uint y, uint z)
         {
-            this.x = (UIntPtr)x;
-            this.y = (UIntPtr)y;
-            this.z = (UIntPtr)z;
+            this.x = x;
+            this.y = y;
+            this.z = z;
         }
     }
 }

src/Veldrid.MetalBindings/MTLRenderCommandEncoder.cs

@@ -107,13 +107,13 @@ public void drawIndexedPrimitives(
                 indirectBuffer,
                 indirectBufferOffset);
 
-        public unsafe void setViewport(MTLViewport viewport)
+        public void setViewport(MTLViewport viewport)
             => objc_msgSend(NativePtr, sel_setViewport, viewport);
 
         public unsafe void setViewports(MTLViewport* viewports, UIntPtr count)
             => objc_msgSend(NativePtr, sel_setViewports, viewports, count);
 
-        public unsafe void setScissorRect(MTLScissorRect scissorRect)
+        public void setScissorRect(MTLScissorRect scissorRect)
             => objc_msgSend(NativePtr, sel_setScissorRect, scissorRect);
 
         public unsafe void setScissorRects(MTLScissorRect* scissorRects, UIntPtr count)

src/Veldrid.MetalBindings/MTLRenderPassColorAttachmentDescriptor.cs

@@ -36,14 +36,12 @@ public MTLClearColor clearColor
         {
             get
             {
-                if (ObjectiveCRuntime.UseStret<MTLClearColor>())
+                if (UseStret<MTLClearColor>())
                 {
                     return objc_msgSend_stret<MTLClearColor>(NativePtr, sel_clearColor);
                 }
-                else
-                {
-                    return MTLClearColor_objc_msgSend(NativePtr,sel_clearColor);
-                }
+
+                return MTLClearColor_objc_msgSend(NativePtr,sel_clearColor);
             }
             set => objc_msgSend(NativePtr, sel_setClearColor, value);
         }

src/Veldrid.MetalBindings/MTLRenderPipelineDescriptor.cs

@@ -1,6 +1,6 @@
-using static Veldrid.MetalBindings.ObjectiveCRuntime;
 using System;
 using System.Runtime.InteropServices;
+using static Veldrid.MetalBindings.ObjectiveCRuntime;
 
 namespace Veldrid.MetalBindings
 {

src/Veldrid.MetalBindings/MTLSamplerState.cs

@@ -1,10 +1,9 @@
 using System;
-using static Veldrid.MetalBindings.ObjectiveCRuntime;
 
 namespace Veldrid.MetalBindings
 {
     public struct MTLSamplerState
     {
         public readonly IntPtr NativePtr;
     }
-}
+}