Code Review feedback

yangyq2016 · Jun 29, 2016 · 2be1e3e · 2be1e3e
1 parent bf6413c
commit 2be1e3e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/Inc/PrimitiveBatch.h b/Inc/PrimitiveBatch.h
@@ -19,8 +19,8 @@
 #include <d3d11_1.h>
 #endif
 
-#include <memory.h>
 #include <memory>
+#include <utility>
 #include <stdint.h>
 
 

diff --git a/Inc/ScreenGrab.h b/Inc/ScreenGrab.h
@@ -38,13 +38,13 @@ namespace DirectX
     HRESULT __cdecl SaveDDSTextureToFile(
         _In_ ID3D11DeviceContext* pContext,
         _In_ ID3D11Resource* pSource,
-        _In_z_ LPCWSTR fileName);
+        _In_z_ const wchar_t* fileName);
 
     HRESULT __cdecl SaveWICTextureToFile(
         _In_ ID3D11DeviceContext* pContext,
         _In_ ID3D11Resource* pSource,
         _In_ REFGUID guidContainerFormat,
-        _In_z_ LPCWSTR fileName,
+        _In_z_ const wchar_t* fileName,
         _In_opt_ const GUID* targetFormat = nullptr,
         _In_opt_ std::function<void __cdecl(IPropertyBag2*)> setCustomProps = nullptr);
 }
diff --git a/Inc/SimpleMath.h b/Inc/SimpleMath.h
@@ -22,6 +22,7 @@
 #endif
 
 #include <functional>
+#include <assert.h>
 #include <memory.h>
 
 #include <DirectXMath.h>

diff --git a/Src/DDSTextureLoader.cpp b/Src/DDSTextureLoader.cpp
@@ -29,6 +29,11 @@
 
 using namespace DirectX;
 
+static_assert(DDS_DIMENSION_TEXTURE1D == D3D11_RESOURCE_DIMENSION_TEXTURE1D, "dds mismatch");
+static_assert(DDS_DIMENSION_TEXTURE2D == D3D11_RESOURCE_DIMENSION_TEXTURE2D, "dds mismatch");
+static_assert(DDS_DIMENSION_TEXTURE3D == D3D11_RESOURCE_DIMENSION_TEXTURE3D, "dds mismatch");
+static_assert(DDS_RESOURCE_MISC_TEXTURECUBE == D3D11_RESOURCE_MISC_TEXTURECUBE, "dds mismatch");
+
 namespace
 {
     //--------------------------------------------------------------------------------------

diff --git a/Src/ScreenGrab.cpp b/Src/ScreenGrab.cpp
@@ -163,9 +163,10 @@ namespace
 
 
 //--------------------------------------------------------------------------------------
-HRESULT DirectX::SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext,
-                                       _In_ ID3D11Resource* pSource,
-                                       _In_z_ LPCWSTR fileName )
+_Use_decl_annotations_
+HRESULT DirectX::SaveDDSTextureToFile( ID3D11DeviceContext* pContext,
+                                       ID3D11Resource* pSource,
+                                       const wchar_t* fileName )
 {
     if ( !fileName )
         return E_INVALIDARG;
@@ -329,12 +330,13 @@ extern bool _IsWIC2();
 extern IWICImagingFactory* _GetWIC();
 }
 
-HRESULT DirectX::SaveWICTextureToFile( _In_ ID3D11DeviceContext* pContext,
-                                       _In_ ID3D11Resource* pSource,
-                                       _In_ REFGUID guidContainerFormat, 
-                                       _In_z_ LPCWSTR fileName,
-                                       _In_opt_ const GUID* targetFormat,
-                                       _In_opt_ std::function<void(IPropertyBag2*)> setCustomProps )
+_Use_decl_annotations_
+HRESULT DirectX::SaveWICTextureToFile( ID3D11DeviceContext* pContext,
+                                       ID3D11Resource* pSource,
+                                       REFGUID guidContainerFormat, 
+                                       const wchar_t* fileName,
+                                       const GUID* targetFormat,
+                                       std::function<void(IPropertyBag2*)> setCustomProps )
 {
     if ( !fileName )
         return E_INVALIDARG;

diff --git a/Src/pch.h b/Src/pch.h
@@ -59,6 +59,7 @@
 #include <memory>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <stdint.h>