Merge branch 'master' into cs50

2019-01-29 00:04:43 -08:00 · 2018-11-15 14:46:08 -08:00 · 2018-08-04 21:33:59 -07:00 · 2018-07-05 16:12:43 -07:00 · 2018-07-05 15:55:00 -07:00 · 2018-07-05 15:45:55 -07:00
48 changed files with 84647 additions and 41187 deletions
--- a/DirectXTex/BCDirectCompute.cpp
+++ b/DirectXTex/BCDirectCompute.cpp
@ -20,13 +20,29 @@ using Microsoft::WRL::ComPtr;

 namespace
 {
-    #include "Shaders\Compiled\BC7Encode_EncodeBlockCS.inc"
-    #include "Shaders\Compiled\BC7Encode_TryMode02CS.inc"
-    #include "Shaders\Compiled\BC7Encode_TryMode137CS.inc"
-    #include "Shaders\Compiled\BC7Encode_TryMode456CS.inc"
-    #include "Shaders\Compiled\BC6HEncode_EncodeBlockCS.inc"
-    #include "Shaders\Compiled\BC6HEncode_TryModeG10CS.inc"
-    #include "Shaders\Compiled\BC6HEncode_TryModeLE10CS.inc"
+    namespace cs5
+    {
+        #include "Shaders\Compiled\BC7Encode_EncodeBlockCS.inc"
+        #include "Shaders\Compiled\BC7Encode_TryMode02CS.inc"
+        #include "Shaders\Compiled\BC7Encode_TryMode137CS.inc"
+        #include "Shaders\Compiled\BC7Encode_TryMode456CS.inc"
+        #include "Shaders\Compiled\BC6HEncode_EncodeBlockCS.inc"
+        #include "Shaders\Compiled\BC6HEncode_TryModeG10CS.inc"
+        #include "Shaders\Compiled\BC6HEncode_TryModeLE10CS.inc"
+    }
+
+#if !defined(_XBOX_ONE) || !defined(_TITLE)
+    namespace cs4
+    {
+        #include "Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc"
+        #include "Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc"
+        #include "Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc"
+        #include "Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc"
+        #include "Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc"
+        #include "Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc"
+        #include "Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc"
+    }
+#endif

    struct BufferBC6HBC7
    {
@ -132,39 +148,88 @@ HRESULT GPUCompressBC::Initialize(ID3D11Device* pDevice)
    //--- Create compute shader library: BC6H -----------------------------------------

    // Modes 11-14
-    HRESULT hr = pDevice->CreateComputeShader(BC6HEncode_TryModeG10CS, sizeof(BC6HEncode_TryModeG10CS), nullptr, m_BC6H_tryModeG10CS.ReleaseAndGetAddressOf());
+#if defined(_XBOX_ONE) && defined(_TITLE)
+    auto blob = cs5::BC6HEncode_TryModeG10CS;
+    auto blobSize = sizeof(cs5::BC6HEncode_TryModeG10CS);
+#else
+    auto blob = (fl >= D3D_FEATURE_LEVEL_11_0) ? cs5::BC6HEncode_TryModeG10CS : cs4::BC6HEncode_TryModeG10CS;
+    auto blobSize = (fl >= D3D_FEATURE_LEVEL_11_0) ? sizeof(cs5::BC6HEncode_TryModeG10CS) : sizeof(cs4::BC6HEncode_TryModeG10CS);
+#endif
+    HRESULT hr = pDevice->CreateComputeShader(blob, blobSize, nullptr, m_BC6H_tryModeG10CS.ReleaseAndGetAddressOf());
    if (FAILED(hr))
        return hr;

    // Modes 1-10
-    hr = pDevice->CreateComputeShader(BC6HEncode_TryModeLE10CS, sizeof(BC6HEncode_TryModeLE10CS), nullptr, m_BC6H_tryModeLE10CS.ReleaseAndGetAddressOf());
+#if defined(_XBOX_ONE) && defined(_TITLE)
+    blob = cs5::BC6HEncode_TryModeLE10CS;
+    blobSize = sizeof(cs5::BC6HEncode_TryModeLE10CS);
+#else
+    blob = (fl >= D3D_FEATURE_LEVEL_11_0) ? cs5::BC6HEncode_TryModeLE10CS : cs4::BC6HEncode_TryModeLE10CS;
+    blobSize = (fl >= D3D_FEATURE_LEVEL_11_0) ? sizeof(cs5::BC6HEncode_TryModeLE10CS) : sizeof(cs4::BC6HEncode_TryModeLE10CS);
+#endif
+    hr = pDevice->CreateComputeShader(blob, blobSize, nullptr, m_BC6H_tryModeLE10CS.ReleaseAndGetAddressOf());
    if (FAILED(hr))
        return hr;

    // Encode
-    hr = pDevice->CreateComputeShader(BC6HEncode_EncodeBlockCS, sizeof(BC6HEncode_EncodeBlockCS), nullptr, m_BC6H_encodeBlockCS.ReleaseAndGetAddressOf());
+#if defined(_XBOX_ONE) && defined(_TITLE)
+    blob = cs5::BC6HEncode_EncodeBlockCS;
+    blobSize = sizeof(cs5::BC6HEncode_EncodeBlockCS);
+#else
+    blob = (fl >= D3D_FEATURE_LEVEL_11_0) ? cs5::BC6HEncode_EncodeBlockCS : cs4::BC6HEncode_EncodeBlockCS;
+    blobSize = (fl >= D3D_FEATURE_LEVEL_11_0) ? sizeof(cs5::BC6HEncode_EncodeBlockCS) : sizeof(cs4::BC6HEncode_EncodeBlockCS);
+#endif
+    hr = pDevice->CreateComputeShader(blob, blobSize, nullptr, m_BC6H_encodeBlockCS.ReleaseAndGetAddressOf());
    if (FAILED(hr))
        return hr;

    //--- Create compute shader library: BC7 ------------------------------------------

    // Modes 4, 5, 6
-    hr = pDevice->CreateComputeShader(BC7Encode_TryMode456CS, sizeof(BC7Encode_TryMode456CS), nullptr, m_BC7_tryMode456CS.ReleaseAndGetAddressOf());
+#if defined(_XBOX_ONE) && defined(_TITLE)
+    blob = cs5::BC7Encode_TryMode456CS;
+    blobSize = sizeof(cs5::BC7Encode_TryMode456CS);
+#else
+    blob = (fl >= D3D_FEATURE_LEVEL_11_0) ? cs5::BC7Encode_TryMode456CS : cs4::BC7Encode_TryMode456CS;
+    blobSize = (fl >= D3D_FEATURE_LEVEL_11_0) ? sizeof(cs5::BC7Encode_TryMode456CS) : sizeof(cs4::BC7Encode_TryMode456CS);
+#endif
+    hr = pDevice->CreateComputeShader(blob, blobSize, nullptr, m_BC7_tryMode456CS.ReleaseAndGetAddressOf());
    if (FAILED(hr))
        return hr;

    // Modes 1, 3, 7
-    hr = pDevice->CreateComputeShader(BC7Encode_TryMode137CS, sizeof(BC7Encode_TryMode137CS), nullptr, m_BC7_tryMode137CS.ReleaseAndGetAddressOf());
+#if defined(_XBOX_ONE) && defined(_TITLE)
+    blob = cs5::BC7Encode_TryMode137CS;
+    blobSize = sizeof(cs5::BC7Encode_TryMode137CS);
+#else
+    blob = (fl >= D3D_FEATURE_LEVEL_11_0) ? cs5::BC7Encode_TryMode137CS : cs4::BC7Encode_TryMode137CS;
+    blobSize = (fl >= D3D_FEATURE_LEVEL_11_0) ? sizeof(cs5::BC7Encode_TryMode137CS) : sizeof(cs4::BC7Encode_TryMode137CS);
+#endif
+    hr = pDevice->CreateComputeShader(blob, blobSize, nullptr, m_BC7_tryMode137CS.ReleaseAndGetAddressOf());
    if (FAILED(hr))
        return hr;

    // Modes 0, 2
-    hr = pDevice->CreateComputeShader(BC7Encode_TryMode02CS, sizeof(BC7Encode_TryMode02CS), nullptr, m_BC7_tryMode02CS.ReleaseAndGetAddressOf());
+#if defined(_XBOX_ONE) && defined(_TITLE)
+    blob = cs5::BC7Encode_TryMode02CS;
+    blobSize = sizeof(cs5::BC7Encode_TryMode02CS);
+#else
+    blob = (fl >= D3D_FEATURE_LEVEL_11_0) ? cs5::BC7Encode_TryMode02CS : cs4::BC7Encode_TryMode02CS;
+    blobSize = (fl >= D3D_FEATURE_LEVEL_11_0) ? sizeof(cs5::BC7Encode_TryMode02CS) : sizeof(cs4::BC7Encode_TryMode02CS);
+#endif
+    hr = pDevice->CreateComputeShader(blob, blobSize, nullptr, m_BC7_tryMode02CS.ReleaseAndGetAddressOf());
    if (FAILED(hr))
        return hr;

    // Encode
-    hr = pDevice->CreateComputeShader(BC7Encode_EncodeBlockCS, sizeof(BC7Encode_EncodeBlockCS), nullptr, m_BC7_encodeBlockCS.ReleaseAndGetAddressOf());
+#if defined(_XBOX_ONE) && defined(_TITLE)
+    blob = cs5::BC7Encode_EncodeBlockCS;
+    blobSize = sizeof(cs5::BC7Encode_EncodeBlockCS);
+#else
+    blob = (fl >= D3D_FEATURE_LEVEL_11_0) ? cs5::BC7Encode_EncodeBlockCS : cs4::BC7Encode_EncodeBlockCS;
+    blobSize = (fl >= D3D_FEATURE_LEVEL_11_0) ? sizeof(cs5::BC7Encode_EncodeBlockCS) : sizeof(cs4::BC7Encode_EncodeBlockCS);
+#endif
+    hr = pDevice->CreateComputeShader(blob, blobSize, nullptr, m_BC7_encodeBlockCS.ReleaseAndGetAddressOf());
    if (FAILED(hr))
        return hr;

--- a/DirectXTex/DirectXTex_Desktop_2015.vcxproj
+++ b/DirectXTex/DirectXTex_Desktop_2015.vcxproj
@ -352,18 +352,32 @@
  <ItemGroup>
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb" />
    <None Include="Shaders\CompileShaders.cmd" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--- a/DirectXTex/DirectXTex_Desktop_2015.vcxproj.filters
+++ b/DirectXTex/DirectXTex_Desktop_2015.vcxproj.filters
@ -159,5 +159,47 @@
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb">
      <Filter>Source Files\Shaders\Symbols</Filter>
    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
  </ItemGroup>
 </Project>
--- a/DirectXTex/DirectXTex_Desktop_2015_Win10.vcxproj
+++ b/DirectXTex/DirectXTex_Desktop_2015_Win10.vcxproj
@ -355,18 +355,32 @@
  <ItemGroup>
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb" />
    <None Include="Shaders\CompileShaders.cmd" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--- a/DirectXTex/DirectXTex_Desktop_2015_Win10.vcxproj.filters
+++ b/DirectXTex/DirectXTex_Desktop_2015_Win10.vcxproj.filters
@ -165,5 +165,47 @@
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb">
      <Filter>Source Files\Shaders\Symbols</Filter>
    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
  </ItemGroup>
 </Project>
--- a/DirectXTex/DirectXTex_Desktop_2017.vcxproj
+++ b/DirectXTex/DirectXTex_Desktop_2017.vcxproj
@ -362,18 +362,32 @@
  <ItemGroup>
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb" />
    <None Include="Shaders\CompileShaders.cmd" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--- a/DirectXTex/DirectXTex_Desktop_2017.vcxproj.filters
+++ b/DirectXTex/DirectXTex_Desktop_2017.vcxproj.filters
@ -159,5 +159,47 @@
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb">
      <Filter>Source Files\Shaders\Symbols</Filter>
    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
  </ItemGroup>
 </Project>
--- a/DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj
+++ b/DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj
@ -364,18 +364,32 @@
  <ItemGroup>
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb" />
    <None Include="Shaders\CompileShaders.cmd" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
--- a/DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj.filters
+++ b/DirectXTex/DirectXTex_Desktop_2017_Win10.vcxproj.filters
@ -165,5 +165,47 @@
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb">
      <Filter>Source Files\Shaders\Symbols</Filter>
    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
  </ItemGroup>
 </Project>
--- a/DirectXTex/DirectXTex_Windows10.vcxproj
+++ b/DirectXTex/DirectXTex_Windows10.vcxproj
@ -80,18 +80,32 @@
    <None Include="DirectXTex.inl" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb" />
    <None Include="Shaders\CompileShaders.cmd" />
  </ItemGroup>
  <ItemGroup>
--- a/DirectXTex/DirectXTex_Windows10.vcxproj.filters
+++ b/DirectXTex/DirectXTex_Windows10.vcxproj.filters
@ -180,5 +180,47 @@
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb">
      <Filter>Source Files\Shaders\Symbols</Filter>
    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
  </ItemGroup>
 </Project>
--- a/DirectXTex/DirectXTex_Windows10_2015.vcxproj
+++ b/DirectXTex/DirectXTex_Windows10_2015.vcxproj
@ -70,18 +70,32 @@
    <None Include="DirectXTex.inl" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb" />
    <None Include="Shaders\CompileShaders.cmd" />
  </ItemGroup>
  <ItemGroup>
--- a/DirectXTex/DirectXTex_Windows10_2015.vcxproj.filters
+++ b/DirectXTex/DirectXTex_Windows10_2015.vcxproj.filters
@ -180,5 +180,47 @@
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb">
      <Filter>Source Files\Shaders\Symbols</Filter>
    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
  </ItemGroup>
 </Project>
--- a/DirectXTex/DirectXTex_XboxOneXDK_2015.vcxproj
+++ b/DirectXTex/DirectXTex_XboxOneXDK_2015.vcxproj
@ -27,18 +27,32 @@
    <None Include="DirectXTex.inl" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb" />
    <None Include="Shaders\CompileShaders.cmd" />
  </ItemGroup>
  <ItemGroup>
@ -229,8 +243,6 @@
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
  <Target Name="ATGEnsureShaders" BeforeTargets="PrepareForBuild">
-    <Exec Condition="!Exists('Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc')"
-        WorkingDirectory="$(ProjectDir)Shaders"
-        Command="CompileShaders" />
+    <Exec Condition="!Exists('Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc')" WorkingDirectory="$(ProjectDir)Shaders" Command="CompileShaders" />
  </Target>
 </Project>
--- a/DirectXTex/DirectXTex_XboxOneXDK_2015.vcxproj.filters
+++ b/DirectXTex/DirectXTex_XboxOneXDK_2015.vcxproj.filters
@ -97,6 +97,48 @@
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb">
      <Filter>Source Files\Shaders\Symbols</Filter>
    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="BC.cpp">
--- a/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj
+++ b/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj
@ -27,18 +27,32 @@
    <None Include="DirectXTex.inl" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.inc" />
    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS.pdb" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.inc" />
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc" />
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb" />
    <None Include="Shaders\CompileShaders.cmd" />
  </ItemGroup>
  <ItemGroup>
--- a/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj.filters
+++ b/DirectXTex/DirectXTex_XboxOneXDK_2017.vcxproj.filters
@ -97,6 +97,48 @@
    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS.pdb">
      <Filter>Source Files\Shaders\Symbols</Filter>
    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.inc">
+      <Filter>Source Files\Shaders\Compiled</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeG10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC6HEncode_TryModeLE10CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_EncodeBlockCS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode02CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode137CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
+    <None Include="Shaders\Compiled\BC7Encode_TryMode456CS_cs40.pdb">
+      <Filter>Source Files\Shaders\Symbols</Filter>
+    </None>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="BC.cpp">
--- a/DirectXTex/Shaders/BC6HEncode.hlsl
+++ b/DirectXTex/Shaders/BC6HEncode.hlsl
@ -979,14 +979,15 @@ void EncodeBlockCS(uint GI : SV_GroupIndex, uint3 groupID : SV_GroupID)
    }
 }

-uint float2half1( float f )
+#ifdef EMULATE_F16C
+uint float2half1(float f)
 {
    uint Result;

    uint IValue = asuint(f);
    uint Sign = (IValue & 0x80000000U) >> 16U;
    IValue = IValue & 0x7FFFFFFFU;
-    
+
    if (IValue > 0x47FFEFFFU)
    {
        // The number is too large to be represented as a half.  Saturate to infinity.
@ -1007,27 +1008,19 @@ uint float2half1( float f )
            IValue += 0xC8000000U;
        }

-        Result = ((IValue + 0x0FFFU + ((IValue >> 13U) & 1U)) >> 13U)&0x7FFFU; 
+        Result = ((IValue + 0x0FFFU + ((IValue >> 13U) & 1U)) >> 13U) & 0x7FFFU;
    }
-    return (Result|Sign);
+    return (Result | Sign);
 }
+#endif

 uint3 float2half( float3 endPoint_f )
 {
-    //uint3 sign = asuint(endPoint_f) & 0x80000000;
-    //uint3 expo = asuint(endPoint_f) & 0x7F800000;
-    //uint3 base = asuint(endPoint_f) & 0x007FFFFF;
-    //return ( expo < 0x33800000 ) ? 0 
-    //                    //0x33800000 indicating 2^-24, which is minimal denormalized number that half can present 
-    //    : ( ( expo < 0x38800000 ) ? ( sign >> 16 ) | ( ( base + 0x00800000 ) >> ( 23 - ( ( expo - 0x33800000 ) >> 23 ) ) )//fixed a bug in v0.2
-    //                    //0x38800000 indicating 2^-14, which is minimal normalized number that half can present, so need to use denormalized half presentation
-    //    : ( ( expo == 0x7F800000 || expo > 0x47000000 ) ? ( ( sign >> 16 ) | 0x7bff )
-    //                    // treat NaN as INF, treat INF (including NaN) as the maximum/minimum number that half can present
-    //                    // 0x47000000 indicating 2^15, which is maximum exponent that half can present, so cut to 0x7bff which is the maximum half number
-    //    : ( ( sign >> 16 ) | ( ( ( expo - 0x38000000 ) | base ) >> 13 ) ) ) );
-
-
-    return uint3( float2half1( endPoint_f.x ), float2half1( endPoint_f.y ), float2half1( endPoint_f.z ) );
+#ifdef EMULATE_F16C
+    return uint3(float2half1(endPoint_f.x), float2half1(endPoint_f.y), float2half1(endPoint_f.z));
+#else
+    return uint3(f32tof16(endPoint_f.x), f32tof16(endPoint_f.y), f32tof16(endPoint_f.z));
+#endif
 }
 int3 start_quantize( uint3 pixel_h )
 {
@ -1204,7 +1197,8 @@ void generate_palette_unquantized16( out uint3 palette, int3 low, int3 high, int
    palette = finish_unquantize( tmp );
 }

-float half2float1( uint Value )
+#ifdef EMULATE_F16C
+float half2float1(uint Value)
 {
    uint Mantissa = (uint)(Value & 0x03FF);

@ -1232,21 +1226,20 @@ float half2float1( uint Value )
    }

    uint Result = ((Value & 0x8000) << 16) | // Sign
-                      ((Exponent + 112) << 23) | // Exponent
-                      (Mantissa << 13);          // Mantissa
+        ((Exponent + 112) << 23) | // Exponent
+        (Mantissa << 13);          // Mantissa

    return asfloat(Result);
 }
+#endif

 float3 half2float(uint3 color_h )
 {
-    //uint3 sign = color_h & 0x8000;
-    //uint3 expo = color_h & 0x7C00;
-    //uint3 base = color_h & 0x03FF;
-    //return ( expo == 0 ) ? asfloat( ( sign << 16 ) | asuint( float3(base) / 16777216 ) ) //16777216 = 2^24
-    //    : asfloat( ( sign << 16 ) | ( ( ( expo + 0x1C000 ) | base ) << 13 ) ); //0x1C000 = 0x1FC00 - 0x3C00
-
-    return float3( half2float1( color_h.x ), half2float1( color_h.y ), half2float1( color_h.z ) );
+#ifdef EMULATE_F16C
+    return float3(half2float1(color_h.x), half2float1(color_h.y), half2float1(color_h.z));
+#else
+    return float3(f16tof32(color_h.x), f16tof32(color_h.y), f16tof32(color_h.z));
+#endif
 }

 void block_package( inout uint4 block, int2x3 endPoint[2], uint mode_type, uint partition_index ) // for mode 1 - 10
--- a/DirectXTex/Shaders/CompileShaders.cmd
+++ b/DirectXTex/Shaders/CompileShaders.cmd
@ -26,7 +26,6 @@ call :CompileShader BC7Encode EncodeBlockCS
 call :CompileShader BC6HEncode TryModeG10CS
 call :CompileShader BC6HEncode TryModeLE10CS
 call :CompileShader BC6HEncode EncodeBlockCS
-
 echo.

 if %error% == 0 (
@ -39,8 +38,10 @@ endlocal
 exit /b

 :CompileShader
-set fxc=%PCFXC% %1.hlsl %FXCOPTS% /Tcs_4_0 /E%2 /FhCompiled\%1_%2.inc /FdCompiled\%1_%2.pdb /Vn%1_%2
+set fxc=%PCFXC% %1.hlsl %FXCOPTS% /Tcs_5_0 /E%2 /FhCompiled\%1_%2.inc /FdCompiled\%1_%2.pdb /Vn%1_%2
+set fxc4=%PCFXC% %1.hlsl %FXCOPTS% /Tcs_4_0 /DEMULATE_F16C /E%2 /FhCompiled\%1_%2_cs40.inc /FdCompiled\%1_%2_cs40.pdb /Vn%1_%2
 echo.
 echo %fxc%
 %fxc% || set error=1
+%fxc4% || set error=1
 exit /b
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS.inc
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS.pdb
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS.pdb
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS_cs40.inc
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS_cs40.inc
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS_cs40.pdb
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_EncodeBlockCS_cs40.pdb
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS.inc
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS.inc
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS.pdb
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS.pdb
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS_cs40.inc
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS_cs40.inc
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS_cs40.pdb
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeG10CS_cs40.pdb
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS.inc
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS.inc
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS.pdb
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS.pdb
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS_cs40.inc
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS_cs40.inc
--- a/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS_cs40.pdb
+++ b/DirectXTex/Shaders/Compiled/BC6HEncode_TryModeLE10CS_cs40.pdb
--- a/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS.inc
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS.inc
--- a/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS.pdb
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS.pdb
--- a/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS_cs40.inc
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS_cs40.inc
--- a/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS_cs40.pdb
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_EncodeBlockCS_cs40.pdb
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS.inc
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS.inc
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS.pdb
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS.pdb
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS_cs40.inc
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS_cs40.inc
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS_cs40.pdb
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode02CS_cs40.pdb
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS.inc
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS.inc
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS.pdb
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS.pdb
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS_cs40.inc
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS_cs40.inc
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS_cs40.pdb
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode137CS_cs40.pdb
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS.inc
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS.inc
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS.pdb
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS.pdb
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS_cs40.inc
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS_cs40.inc
--- a/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS_cs40.pdb
+++ b/DirectXTex/Shaders/Compiled/BC7Encode_TryMode456CS_cs40.pdb
--- a/Texconv/texconv.cpp
+++ b/Texconv/texconv.cpp
@ -426,6 +426,14 @@ const SValue g_pFeatureLevels[] =   // valid feature levels for -fl for maximimu
    { nullptr, 0 },
 };

+const SValue g_pDirectCompute[] =
+{
+    { L"4.0", D3D_FEATURE_LEVEL_10_0 },
+    { L"4.1", D3D_FEATURE_LEVEL_10_1 },
+    { L"5.0", D3D_FEATURE_LEVEL_11_0 },
+    { nullptr, 0 }
+};
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@ -878,7 +886,7 @@ namespace
                    hr = pAdapter->GetDesc(&desc);
                    if (SUCCEEDED(hr))
                    {
-                        wprintf(L"\n[Using DirectCompute on \"%ls\"]\n", desc.Description);
+                        wprintf(L"\n[Using DirectCompute %ls on \"%ls\"]\n", LookupByValue(fl, g_pDirectCompute), desc.Description);
                    }
                }
            }
Author	SHA1	Message	Date
Chuck Walbourn	e6f78c53af	Merge branch 'master' into cs50	2019-01-29 00:04:43 -08:00
Chuck Walbourn	71a62171f8	Merge branch 'master' into cs50	2018-11-15 14:46:08 -08:00
Chuck Walbourn	8930f9a5ec	Merge branch 'master' into cs50	2018-08-04 21:33:59 -07:00
Chuck Walbourn	8a934880bd	Texconv should still support 10.x scenarios	2018-07-05 16:12:43 -07:00
Chuck Walbourn	43eb1d78e1	Merge branch 'master' into cs50	2018-07-05 15:55:00 -07:00
Chuck Walbourn	ca97268961	Merge branch 'master' into cs50	2018-07-05 15:45:55 -07:00
Chuck Walbourn	ade5129bf7	Update vcxproj for new shaders	2018-07-05 15:30:48 -07:00
Chuck Walbourn	4b6bc3b39d	Merge branch 'master' into cs50	2018-07-03 19:37:00 -07:00
Chuck Walbourn	1a910c9053	For CS 4.x should still emulate f32<->f16	2018-07-03 19:36:42 -07:00
Chuck Walbourn	832562a6d2	Merge branch 'master' into cs50	2018-07-03 19:07:54 -07:00
Chuck Walbourn	65e5766a65	Fix for texconv	2018-07-03 16:24:34 -07:00
Chuck Walbourn	99b3c9b7e9	Use CS 4.0 or CS 5.0 based on hardware	2018-07-03 15:34:51 -07:00
Chuck Walbourn	cbcf91c206	Merge branch 'master' into cs50	2018-07-03 15:17:09 -07:00
Chuck Walbourn	78eaebd953	Build both CS50 and 40	2018-07-03 15:16:26 -07:00
Chuck Walbourn	92bf104c8e	Update GPU encoder to require DirectCompute 5	2018-06-28 18:38:03 -07:00