From 11e2877d02f89bc555016123f93b0d0d2208c687 Mon Sep 17 00:00:00 2001
From: gamebabyrocksun <41750362@qq.com>
Date: Wed, 8 Feb 2023 09:10:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E5=8F=8A=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=BA=9B=E5=B0=8F?=
 =?UTF-8?q?=E7=9A=84bug=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=B1=9E=E6=80=A7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 13-ShowGIFAndResourceStatus/13-ShowGIFAndResourceStatus.vcxproj | 2 +-
 22-MultiInstance-PBR-Sphere/22-MultiInstance-PBR-Sphere.cpp     | 1 +
 24-CubeMapWithoutDDS/24-CubeMapWithoutDDS.cpp                   | 2 +-
 .../Shader/GRS_1Times_GS_HDR_2_CubeMap_VS_GS.hlsl               | 1 -
 .../26-Normal-Map-And-Tangent-Space.cpp                         | 2 +-
 5-SkyBox/5-SkyBox.cpp                                           | 2 ++
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/13-ShowGIFAndResourceStatus/13-ShowGIFAndResourceStatus.vcxproj b/13-ShowGIFAndResourceStatus/13-ShowGIFAndResourceStatus.vcxproj
index 08340a4..ae73b18 100644
--- a/13-ShowGIFAndResourceStatus/13-ShowGIFAndResourceStatus.vcxproj
+++ b/13-ShowGIFAndResourceStatus/13-ShowGIFAndResourceStatus.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{B3D520CA-D4E5-4513-8664-4EAC26C10650}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>My13ShowGIFAndResourceStatus</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
diff --git a/22-MultiInstance-PBR-Sphere/22-MultiInstance-PBR-Sphere.cpp b/22-MultiInstance-PBR-Sphere/22-MultiInstance-PBR-Sphere.cpp
index 50c9a81..5c87f08 100644
--- a/22-MultiInstance-PBR-Sphere/22-MultiInstance-PBR-Sphere.cpp
+++ b/22-MultiInstance-PBR-Sphere/22-MultiInstance-PBR-Sphere.cpp
@@ -844,6 +844,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR    l
             stVBV[1].SizeInBytes = iRowCnts * iColCnts * sizeof(ST_GRS_PER_INSTANCE);
         }
 
+        {}
         // 10、填充资源屏障结构
         {
             stBeginResBarrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION;
diff --git a/24-CubeMapWithoutDDS/24-CubeMapWithoutDDS.cpp b/24-CubeMapWithoutDDS/24-CubeMapWithoutDDS.cpp
index 38d0dfe..8319a83 100644
--- a/24-CubeMapWithoutDDS/24-CubeMapWithoutDDS.cpp
+++ b/24-CubeMapWithoutDDS/24-CubeMapWithoutDDS.cpp
@@ -822,7 +822,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR    l
             GRS_THROW_IF_FAILED(g_stD3DDevice.m_pID3D12Device4->CreateCommittedResource(
                 &g_stDefaultHeapProps
                 , D3D12_HEAP_FLAG_NONE
-                , &stResourceDesc				//可以使用CD3DX12_RESOURCE_DESC::Tex2D来简化结构体的初始化
+                , &stResourceDesc			
                 , D3D12_RESOURCE_STATE_COPY_DEST
                 , nullptr
                 , IID_PPV_ARGS(&g_stSkyBoxData.m_pITexture)));
diff --git a/25-IBL-MultiInstance-Sphere/Shader/GRS_1Times_GS_HDR_2_CubeMap_VS_GS.hlsl b/25-IBL-MultiInstance-Sphere/Shader/GRS_1Times_GS_HDR_2_CubeMap_VS_GS.hlsl
index 6019e34..e3ca8b5 100644
--- a/25-IBL-MultiInstance-Sphere/Shader/GRS_1Times_GS_HDR_2_CubeMap_VS_GS.hlsl
+++ b/25-IBL-MultiInstance-Sphere/Shader/GRS_1Times_GS_HDR_2_CubeMap_VS_GS.hlsl
@@ -40,7 +40,6 @@ void GSMain(triangle ST_GRS_HLSL_GS_IN stGSInput[3], inout TriangleStream<ST_GRS
 
         for (int v = 0; v < 3; v++)
         {
-            stGSOutput.RTIndex = f;
             // 下面的乘积是可以优化的，可以提前在 CPP 中 将6个View矩阵分别先与Projection矩阵相乘，再传入Shader
             // 当然因为这里是固定的Cube
             stGSOutput.m_v4WPos = stGSInput[v].m_v4WPos;
diff --git a/26-Normal-Map-And-Tangent-Space/26-Normal-Map-And-Tangent-Space.cpp b/26-Normal-Map-And-Tangent-Space/26-Normal-Map-And-Tangent-Space.cpp
index d5a2fcb..6d8883a 100644
--- a/26-Normal-Map-And-Tangent-Space/26-Normal-Map-And-Tangent-Space.cpp
+++ b/26-Normal-Map-And-Tangent-Space/26-Normal-Map-And-Tangent-Space.cpp
@@ -191,7 +191,7 @@ ST_GRS_SCENE_CONST_DATA                     g_stCBData = {};
 ST_GRS_CONST_BUFFER                         g_stConstBuffer = {};
 
 ST_GRS_PSO                                  g_stModelPSO = {};
-ST_GRS_DESCRIPTOR_HEAP                             g_stModelHeap = {};
+ST_GRS_DESCRIPTOR_HEAP                      g_stModelHeap = {};
 ST_GRS_MESH_DATA_MULTI_SLOT                 g_stMeshData = {};
 
 void OnSize(UINT width, UINT height, bool minimized);
diff --git a/5-SkyBox/5-SkyBox.cpp b/5-SkyBox/5-SkyBox.cpp
index cb0652b..87f0dae 100644
--- a/5-SkyBox/5-SkyBox.cpp
+++ b/5-SkyBox/5-SkyBox.cpp
@@ -1068,6 +1068,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR    l
 			GRS_SAFE_FREE(pbPicData);
 		}
 
+		{}
 		// 使用DDSLoader辅助函数加载Skybox的纹理
 		{
 			TCHAR pszSkyboxTextureFile[MAX_PATH] = {};
@@ -1223,6 +1224,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR    l
 			pICmdListDirect->ResourceBarrier(1, &stTransResBarrier);
 		}
 
+		{}
 		//向直接命令列表发出从上传堆复制纹理数据到默认堆的命令，执行并同步等待，即完成第二个Copy动作，由GPU上的复制引擎完成
 		//注意此时直接命令列表还没有绑定PSO对象，因此它也是不能执行3D图形命令的，但是可以执行复制命令，因为复制引擎不需要什么
 		//额外的状态设置之类的参数
-- 
GitLab