WASAPI排他の名前空間をWASAPIに修正。

[strokestylet/CsWin10Desktop3.git] / FDK24 / Utilities.cs

diff --git a/FDK24/Utilities.cs b/FDK24/Utilities.cs
index 0b34847..1eb7d0d 100644 (file)
--- a/FDK24/Utilities.cs
+++ b/FDK24/Utilities.cs
@@ -99,7 +99,7 @@ namespace FDK
                /// （参考: http://qiita.com/oguna/items/c516e09ee57d931892b6 ）
                /// </remarks>
                public static SharpDX.Direct3D11.ShaderResourceView CreateShaderResourceViewFromFile(
-                       SharpDX.Direct3D11.Device d3dDevice, string 画像ファイルパス, out SharpDX.Size2F ビューのサイズ, out SharpDX.Direct3D11.Texture2D テクスチャ )
+                       SharpDX.Direct3D11.Device d3dDevice, SharpDX.Direct3D11.BindFlags bindFlags, string 画像ファイルパス, out SharpDX.Size2F ビューのサイズ, out SharpDX.Direct3D11.Texture2D テクスチャ )
                {
                        ビューのサイズ = new SharpDX.Size2F( 0, 0 );
                        var srv = (SharpDX.Direct3D11.ShaderResourceView) null;
@@ -112,7 +112,7 @@ namespace FDK
                                        var dataBox = new[] { new SharpDX.DataBox( ロック領域.Scan0, bitmap.Width * 4, bitmap.Height ) };
                                        var textureDesc = new SharpDX.Direct3D11.Texture2DDescription() {
                                                ArraySize = 1,
-                                               BindFlags = SharpDX.Direct3D11.BindFlags.ShaderResource,
+                                               BindFlags = bindFlags,
                                                CpuAccessFlags = SharpDX.Direct3D11.CpuAccessFlags.None,
                                                Format = SharpDX.DXGI.Format.B8G8R8A8_UNorm,
                                                Height = bitmap.Height,
@@ -140,11 +140,11 @@ namespace FDK
                /// 空のテクスチャとそのシェーダーリソースビューを作成し、返す。
                /// </summary>
                public static SharpDX.Direct3D11.ShaderResourceView CreateShaderResourceView(
-                       SharpDX.Direct3D11.Device d3dDevice, SharpDX.Size2 サイズdpx, out SharpDX.Direct3D11.Texture2D テクスチャ )
+                       SharpDX.Direct3D11.Device d3dDevice, SharpDX.Direct3D11.BindFlags bindFlags, SharpDX.Size2 サイズdpx, out SharpDX.Direct3D11.Texture2D テクスチャ )
                {
                        var textureDesc = new SharpDX.Direct3D11.Texture2DDescription() {
                                ArraySize = 1,
-                               BindFlags = SharpDX.Direct3D11.BindFlags.ShaderResource,
+                               BindFlags = bindFlags,
                                CpuAccessFlags = SharpDX.Direct3D11.CpuAccessFlags.None,
                                Format = SharpDX.DXGI.Format.B8G8R8A8_UNorm,
                                Height = サイズdpx.Height,
@@ -163,4 +163,4 @@ namespace FDK
                        return new SharpDX.Direct3D11.ShaderResourceView( d3dDevice, texture );
                }
        }
-}
+}
\ No newline at end of file