Changing descriptor update signature

This commit is contained in:
Dynamitos
2024-09-27 15:57:37 +02:00
parent 1c7a3db939
commit 242acdab58
28 changed files with 240 additions and 225 deletions
+1 -1
View File
@@ -151,7 +151,7 @@ void meshMain(
// float3 displacement2 = pWaterMaterial.displacementTextures.Sample(pWaterMaterial.sampler, float3(worldPos.xz * pWaterMaterial.tile2, 1)).xyz * pWaterMaterial.contributeDisplacement2;
// float3 displacement3 = pWaterMaterial.displacementTextures.Sample(pWaterMaterial.sampler, float3(worldPos.xz * pWaterMaterial.tile3, 2)).xyz * pWaterMaterial.contributeDisplacement3;
// float3 displacement4 = pWaterMaterial.displacementTextures.Sample(pWaterMaterial.sampler, float3(worldPos.xz * pWaterMaterial.tile4, 3)).xyz * pWaterMaterial.contributeDisplacement4;
float displacement = pTerrainData.displacement.Sample(pTerrainData.sampler, worldPos.xz);
float displacement = pTerrainData.displacement.SampleLevel(pTerrainData.sampler, worldPos.xz, 0);
float4 clipPos = mul(vp, float4(worldPos, 1));
float ndcDepth = clipPos.z / clipPos.w;
+1 -1
View File
@@ -10,7 +10,7 @@ struct DispatchParams
struct DispatchParamWrapper
{
ParameterBlock<DispatchParams> p;
DispatchParams p;
RWStructuredBuffer<Frustum> frustums;
}
ParameterBlock<DispatchParamWrapper> pDispatchParams;
+1 -1
View File
@@ -10,9 +10,9 @@ import Scene;
//};
struct MaterialResources
{
StructuredBuffer<float> floatArray;
Texture2D textureArray[512];
SamplerState samplerArray[512];
StructuredBuffer<float> floatArray;
};
layout(set=4)
ParameterBlock<MaterialResources> pResources;
+1 -1
View File
@@ -3,7 +3,7 @@ import MaterialParameter;
import LightEnv;
import Scene;
import RayTracingData;
import VertexData;
import StaticMeshVertexData;
import Material;
import MATERIAL_FILE_NAME;