Bladeren bron

修改了GPU相关代码

luo 9 maanden geleden
bovenliggende
commit
ced1e13f66

+ 1 - 1
AppResource/Resource.xaml

@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
     xmlns:system="clr-namespace:System;assembly=mscorlib">
-    <system:String x:Key="Title">分布式采集控制系统</system:String>
+    <system:String x:Key="Title">集控制系统</system:String>
     <SolidColorBrush x:Key="NomalForeColor" Color="White" />
     <SolidColorBrush x:Key="ButtonBackColor" Color="Transparent" />
     <SolidColorBrush x:Key="ButtonBorderColor" Color="#4165cc" />

+ 13 - 0
Veldrid/Veldrid/D3D11/D3D11Formats.cs

@@ -120,6 +120,10 @@ namespace Veldrid.D3D11
                     return Format.BC5_UNorm;
                 case PixelFormat.BC5_SNorm:
                     return Format.BC5_SNorm;
+                case PixelFormat.BC6_SNorm:
+                    return Format.BC6H_Sf16;
+                case PixelFormat.BC6_UNorm:
+                    return Format.BC6H_Uf16;
                 case PixelFormat.BC7_UNorm:
                     return Format.BC7_UNorm;
                 case PixelFormat.BC7_UNorm_SRgb:
@@ -245,6 +249,10 @@ namespace Veldrid.D3D11
                 case Format.BC5_UNorm:
                 case Format.BC5_SNorm:
                     return Format.BC5_Typeless;
+                case Format.BC6H_Uf16:
+                case Format.BC6H_Sf16:
+                case Format.BC6H_Typeless:
+                    return Format.BC6H_Typeless;
                 case Format.B8G8R8A8_Typeless:
                 case Format.B8G8R8A8_UNorm:
                 case Format.B8G8R8A8_UNorm_SRgb:
@@ -520,6 +528,11 @@ namespace Veldrid.D3D11
                     return PixelFormat.BC4_SNorm;
                 case Format.BC5_UNorm:
                     return PixelFormat.BC5_UNorm;
+
+                case Format.BC6H_Sf16:
+                    return PixelFormat.BC6_SNorm;
+                case Format.BC6H_Uf16:
+                    return PixelFormat.BC6_UNorm;
                 case Format.BC5_SNorm:
                     return PixelFormat.BC5_SNorm;
                 case Format.BC7_UNorm:

+ 1 - 1
Veldrid/Veldrid/D3D11/D3D11GraphicsDevice.cs

@@ -14,7 +14,7 @@ using Vortice.DXGI.Debug;
 
 namespace Veldrid.D3D11
 {
-    internal class D3D11GraphicsDevice : GraphicsDevice
+    public class D3D11GraphicsDevice : GraphicsDevice
     {
         private readonly IDXGIAdapter _dxgiAdapter;
         private readonly ID3D11Device _device;

+ 1 - 1
Veldrid/Veldrid/D3D11/D3D11Texture.cs

@@ -4,7 +4,7 @@ using Vortice.Direct3D11;
 
 namespace Veldrid.D3D11
 {
-    internal class D3D11Texture : Texture
+    public class D3D11Texture : Texture
     {
         private readonly ID3D11Device _device;
         private string _name;

+ 2 - 0
Veldrid/Veldrid/PixelFormat.cs

@@ -229,6 +229,8 @@
         /// BC5 block compressed format, signed normalized values.
         /// </summary>
         BC5_SNorm,
+        BC6_UNorm,
+        BC6_SNorm,
         /// <summary>
         /// BC7 block compressed format.
         /// </summary>