修正了第10个例子中水彩画滤镜效果采样坐标错误导致g_fWaterPower参数无效的问题

10-PixelShaderTips/10-PixelShaderTips.cpp

@@ -212,7 +212,7 @@ ComPtr<ID3D12DescriptorHeap>		g_pIDSVHeap;				//
 
 TCHAR								g_pszAppPath[MAX_PATH] = {};
 
-UINT								g_nFunNO = 11;		//当前使用效果函数的序号（按空格键循环切换）
+UINT								g_nFunNO = 0;		//当前使用效果函数的序号（按空格键循环切换）
 UINT								g_nMaxFunNO = 12;    //总的效果函数个数
 
 float								g_fQuatLevel = 2.0f;    //量化bit数，取值2-6
@@ -826,7 +826,9 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR    l
 					arCmdList.Add(g_stThreadParams[g_nThdCube].pICmdList);
 					arCmdList.Add(g_stThreadParams[g_nThdPlane].pICmdList);
 
-					pIMainCmdQueue->ExecuteCommandLists(static_cast<UINT>(arCmdList.GetCount()), arCmdList.GetData());
+					pIMainCmdQueue->ExecuteCommandLists(
+						static_cast<UINT>(arCmdList.GetCount())
+						, arCmdList.GetData());
 
 					//---------------------------------------------------------------------------------------------
 					//开始同步GPU与CPU的执行，先记录围栏标记值

10-PixelShaderTips/Shader/10-PixelShaderTips.hlsl

@@ -55,7 +55,7 @@ float4 Anaglyph(PSInput input)
 
 static float2 g_v2MosaicSize1 = float2(8.0f, 8.0f);
 float4 Mosaic1(PSInput input)
-{
+{//方形马赛克
 	float2 v2PixelSite 
 		= float2(input.m_v2UV.x * g_v2TexSize.x
 			, input.m_v2UV.y * g_v2TexSize.y);
@@ -69,8 +69,9 @@ float4 Mosaic1(PSInput input)
 }
 
 static float2 g_v2MosaicSize2 = float2(16.0f, 16.0f);
+
 float4 Mosaic2(PSInput input)
-{
+{//圆形马赛克
 	float2 v2PixelSite
 		= float2(input.m_v2UV.x * g_v2TexSize.x
 			, input.m_v2UV.y * g_v2TexSize.y);
@@ -101,7 +102,7 @@ float4 Mosaic2(PSInput input)
 }
 
 float4 Do_Filter(float3x3 mxFilter,float2 v2UV,float2 v2TexSize, Texture2D t2dTexture)
-{
+{//根据滤波矩阵计算“九宫格”形式像素的滤波结果的函数
 	float2 v2aUVDelta[3][3]
 		= {
 			{ float2(-1.0f,-1.0f), float2(0.0f,-1.0f),float2(1.0f,-1.0f) },
@@ -260,7 +261,7 @@ float4 Watercolour(float2 v2UV,float2 v2TexSize)
 	float2 v2NewUV 
 		= float2(v2UV.x + c4NoiseColor.x / v2TexSize.x
 			, v2UV.y + c4NoiseColor.y / v2TexSize.y);
-	float4 c4Color = g_texture.Sample(g_sampler, v2UV);
+	float4 c4Color = g_texture.Sample(g_sampler, v2NewUV);
 	return Quant(c4Color, 255 / pow(2, g_fQuatLevel));
 }
 

7-D3D12MultiAdapter/7-D3D12MultiAdapter.cpp

@@ -365,7 +365,9 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR    l
 				if ( SUCCEEDED(hrEnumOutput) && nullptr != pIOutput)
 				{//该适配器带有显示输出，通常是集显（针对笔记本的情况）
 					//我们将集显称为Main Device，因为用它来后处理和最终输出
-					GRS_THROW_IF_FAILED(D3D12CreateDevice(pIAdapterTmp, D3D_FEATURE_LEVEL_12_1, IID_PPV_ARGS(&stGPUParams[nIDGPUMain].m_pID3DDevice)));
+					GRS_THROW_IF_FAILED(D3D12CreateDevice(pIAdapterTmp
+						, D3D_FEATURE_LEVEL_12_1
+						, IID_PPV_ARGS(&stGPUParams[nIDGPUMain].m_pID3DDevice)));
 				}
 				else
 				{//不带显示输出的，通常是独显（针对笔记本的情况）