Renamed resource types (#883)

* Cleaned up some visual noise by reducing redundancies in resource names

* Changed wireframe to match the other uniform buffers

resources/shaders/Normals.psh

@@ -5,10 +5,10 @@
 
 #include "Lighting.fxh"
 
-Texture2D     TextureBufferData[];
-SamplerState  TextureBufferData_sampler; // By convention, texture samplers must use the '_sampler' suffix
+Texture2D     Textures[];
+SamplerState  Textures_sampler; // By convention, texture samplers must use the '_sampler' suffix
 
-cbuffer EnvironmentBufferData
+cbuffer EnvironmentProperties
 {
     float4x4 cameraViewProjection;
     float4x4 cameraInvProjection;
@@ -30,7 +30,7 @@ struct MaterialData
     float padding3;
 };
 
-StructuredBuffer<MaterialData> MaterialBufferData : register(t1);
+StructuredBuffer<MaterialData> Materials : register(t1);
 
 struct PSInput 
 { 
@@ -49,9 +49,9 @@ struct PSOutput
 void main(in  PSInput  PSIn, out PSOutput PSOut)
 {
     float4 Color;
-    uint normalIndex = MaterialBufferData[PSIn.MaterialIndex].normalIndex;
-    Color = TextureBufferData[normalIndex].Sample(TextureBufferData_sampler, PSIn.UV);
+    uint normalIndex = Materials[PSIn.MaterialIndex].normalIndex;
+    Color = Textures[normalIndex].Sample(Textures_sampler, PSIn.UV);
     float3 viewDir = normalize(cameraPosition - PSIn.WorldPos);
-    float3 adjustedNormals = PSIn.Normal * MaterialBufferData[PSIn.MaterialIndex].normalIntensity;
+    float3 adjustedNormals = PSIn.Normal * Materials[PSIn.MaterialIndex].normalIntensity;
     PSOut.Color = float4(adjustedNormals, 1-dot(PSIn.Normal, -viewDir));
 }

resources/shaders/PPEnd.psh

@@ -3,11 +3,11 @@
 #   define NonUniformResourceIndex(x) x
 #endif
 
-Texture2D     PostProcessColorSinkBufferData[];
-Texture2D     PostProcessDepthSinkBufferData[];
-SamplerState  PostProcessColorSinkBufferData_sampler; // By convention, texture samplers must use the '_sampler' suffix
+Texture2D     ColorSinks[];
+Texture2D     DepthSinks[];
+SamplerState  ColorSinks_sampler; // By convention, texture samplers must use the '_sampler' suffix
 
-cbuffer PostProcessSinkIndexBufferData
+cbuffer SinkIndices
 {
     uint colorRT1;
     uint colorRT2;
@@ -32,5 +32,5 @@ struct PSOutput
 
 void main(in PSInput PSIn, out PSOutput PSOut)
 {
-    PSOut.Color = PostProcessColorSinkBufferData[colorRT1].Sample(PostProcessColorSinkBufferData_sampler, PSIn.UV);;
+    PSOut.Color = ColorSinks[colorRT1].Sample(ColorSinks_sampler, PSIn.UV);;
 }

resources/shaders/PPFxaa.psh

@@ -1,10 +1,10 @@
 // Much credit to Timothy Lottes and Simon Rodriguez https://blog.simonrodriguez.fr/articles/2016/07/implementing_fxaa.html
 
-Texture2D     PostProcessColorSinkBufferData[];
-Texture2D     PostProcessDepthSinkBufferData[];
-SamplerState  PostProcessColorSinkBufferData_sampler; // By convention, texture samplers must use the '_sampler' suffix
+Texture2D     ColorSinks[];
+Texture2D     DepthSinks[];
+SamplerState  ColorSinks_sampler; // By convention, texture samplers must use the '_sampler' suffix
 
-cbuffer EnvironmentBufferData
+cbuffer EnvironmentProperties
 {
     float4x4 cameraViewProjection;
     float4x4 cameraInvProjection;
@@ -14,7 +14,7 @@ cbuffer EnvironmentBufferData
     float farClip;
 };
 
-cbuffer PostProcessSinkIndexBufferData
+cbuffer SinkIndices
 {
     uint colorRT1;
     uint colorRT2;
@@ -49,8 +49,8 @@ static float SubpixelQuality = 0.75f;
 void main(in PSInput PSIn, out PSOutput PSOut)
 {
     // Alias the resource names
-    SamplerState smplr = PostProcessColorSinkBufferData_sampler;
-    Texture2D colorTex = PostProcessColorSinkBufferData[colorRT1];
+    SamplerState smplr = ColorSinks_sampler;
+    Texture2D colorTex = ColorSinks[colorRT1];
     float4 sceneColor = colorTex.Sample(smplr, PSIn.UV);
 
     // Get screen dimensions

resources/shaders/PPOutline.psh

@@ -1,10 +1,10 @@
 // Much credit given to: https://roystan.net/articles/outline-shader/
 
-Texture2D     PostProcessColorSinkBufferData[];
-Texture2D     PostProcessDepthSinkBufferData[];
-SamplerState  PostProcessColorSinkBufferData_sampler; // By convention, texture samplers must use the '_sampler' suffix
+Texture2D     ColorSinks[];
+Texture2D     DepthSinks[];
+SamplerState  ColorSinks_sampler; // By convention, texture samplers must use the '_sampler' suffix
 
-cbuffer EnvironmentBufferData
+cbuffer EnvironmentProperties
 {
     float4x4 cameraViewProjection;
     float4x4 cameraInvProjection;
@@ -14,7 +14,7 @@ cbuffer EnvironmentBufferData
     float farClip;
 };
 
-cbuffer PostProcessSinkIndexBufferData
+cbuffer SinkIndices
 {
     uint colorRT1;
     uint colorRT2;
@@ -26,7 +26,7 @@ cbuffer PostProcessSinkIndexBufferData
     uint depthRT4;
 };
 
-cbuffer OutlinePassBufferData
+cbuffer OutlinePassProperties
 {
     float3 outlineColor;
     float outlineWidth;
@@ -101,10 +101,10 @@ float OutlineNormals(Texture2D normalsTex, SamplerState smplr, float2 LLUV, floa
 void main(in PSInput PSIn, out PSOutput PSOut)
 {
     // Alias the resource names
-    SamplerState smplr = PostProcessColorSinkBufferData_sampler;
-    Texture2D depthTex = PostProcessDepthSinkBufferData[depthRT1];
-    Texture2D colorTex = PostProcessColorSinkBufferData[colorRT1];
-    Texture2D normalTex = PostProcessColorSinkBufferData[colorRT2];
+    SamplerState smplr = ColorSinks_sampler;
+    Texture2D depthTex = DepthSinks[depthRT1];
+    Texture2D colorTex = ColorSinks[colorRT1];
+    Texture2D normalTex = ColorSinks[colorRT2];
 
     // Get screen dimensions
     uint screenWidth, screenHeight;

resources/shaders/PPWave.psh

@@ -3,11 +3,11 @@
 #   define NonUniformResourceIndex(x) x
 #endif
 
-Texture2D     PostProcessColorSinkBufferData[];
-Texture2D     PostProcessDepthSinkBufferData[];
-SamplerState  PostProcessColorSinkBufferData_sampler; // By convention, texture samplers must use the '_sampler' suffix
+Texture2D     ColorSinks[];
+Texture2D     DepthSinks[];
+SamplerState  ColorSinks_sampler; // By convention, texture samplers must use the '_sampler' suffix
 
-cbuffer PostProcessSinkIndexBufferData
+cbuffer SinkIndices
 {
     uint colorRT1;
     uint colorRT2;
@@ -33,7 +33,7 @@ struct PSOutput
 void main(in PSInput PSIn, out PSOutput PSOut)
 {
     float2 DistortedUV = PSIn.UV + float2(sin(PSIn.UV.y * 100) * 0.1 * sin(PSIn.UV.x * 100.0) * 0.05);
-    float4 Color = PostProcessColorSinkBufferData[colorRT1].Sample(PostProcessColorSinkBufferData_sampler, DistortedUV);
+    float4 Color = ColorSinks[colorRT1].Sample(ColorSinks_sampler, DistortedUV);
 
     PSOut.Color = Color;
 }

resources/shaders/Particle.psh

@@ -10,10 +10,10 @@ struct PSOutput
     float4 Color : SV_TARGET;
 };
 
-Texture2D     TextureBufferData[];
-SamplerState  TextureBufferData_sampler;
+Texture2D     Textures[];
+SamplerState  Textures_sampler;
 
 void main(in PSInput PSIn, out PSOutput PSOut)
 {
-    PSOut.Color = TextureBufferData[PSIn.TextureIndex].Sample(TextureBufferData_sampler, PSIn.UV);
+    PSOut.Color = Textures[PSIn.TextureIndex].Sample(Textures_sampler, PSIn.UV);
 }

resources/shaders/Particle.vsh

@@ -12,7 +12,7 @@ struct PSOutput
     uint   TextureIndex;
 };
 
-cbuffer EnvironmentBufferData
+cbuffer EnvironmentProperties
 {
     float4x4 cameraViewProjection;
     float4x4 cameraInvProjection;
@@ -28,11 +28,11 @@ struct ParticleData
     uint textureIndex;
 };
 
-StructuredBuffer<ParticleData> ParticleBufferData;
+StructuredBuffer<ParticleData> Particles;
 
 void main(in VSInput VSIn, uint InstanceID : SV_InstanceID, out PSOutput PSOut)
 {
-    ParticleData particle = ParticleBufferData[InstanceID];
+    ParticleData particle = Particles[InstanceID];
     float4 TransformedPos = mul(float4(VSIn.Pos, 1.0), particle.model);
     PSOut.Pos = mul(TransformedPos, cameraViewProjection);
     PSOut.UV = VSIn.UV;

resources/shaders/Toon.psh

@@ -5,10 +5,10 @@
 
 #include "Lighting.fxh"
 
-Texture2D     TextureBufferData[];
-SamplerState  TextureBufferData_sampler; // By convention, texture samplers must use the '_sampler' suffix
+Texture2D     Textures[];
+SamplerState  Textures_sampler; // By convention, texture samplers must use the '_sampler' suffix
 
-cbuffer EnvironmentBufferData
+cbuffer EnvironmentProperties
 {
     float4x4 cameraViewProjection;
     float4x4 cameraInvProjection;
@@ -30,8 +30,8 @@ struct MaterialData
     float padding3;
 };
 
-StructuredBuffer<MaterialData> MaterialBufferData : register(t1);
-StructuredBuffer<LightData> LightBufferData : register(t2);
+StructuredBuffer<MaterialData> Materials : register(t1);
+StructuredBuffer<LightData> Lights : register(t2);
 
 struct PSInput 
 { 
@@ -67,14 +67,14 @@ float LightBand(float lightAmount)
 void main(in  PSInput  PSIn, out PSOutput PSOut)
 {
     float4 Color;
-    uint TexIndex = MaterialBufferData[PSIn.MaterialIndex].diffuseTexture;
-    Color = TextureBufferData[TexIndex].Sample(TextureBufferData_sampler, PSIn.UV);
+    uint TexIndex = Materials[PSIn.MaterialIndex].diffuseTexture;
+    Color = Textures[TexIndex].Sample(Textures_sampler, PSIn.UV);
     float alpha = Color.a;
     float3 finalColor = {0.0f, 0.0f, 0.0f};
 
     for (int i = 0; i < lightCount; i++)
     {
-        LightInfluence influence = LightRadiance(LightBufferData[i], PSIn.WorldPos, cameraPosition, PSIn.Normal);
+        LightInfluence influence = LightRadiance(Lights[i], PSIn.WorldPos, cameraPosition, PSIn.Normal);
         finalColor += influence.color * LightBand(influence.specularAmt + influence.diffuseAmt);
     }
 

resources/shaders/Toon.vsh

@@ -20,17 +20,17 @@ struct TransformData
     float4x4 model;
 };
 
-StructuredBuffer<TransformData> TransformBufferData;
+StructuredBuffer<TransformData> Transforms;
 
 struct StaticMeshInstanceData
 {
     uint transformIndex;
     uint materialIndex;
 };
 
-StructuredBuffer<StaticMeshInstanceData> StaticInstanceBufferData;
+StructuredBuffer<StaticMeshInstanceData> StaticInstances;
 
-cbuffer EnvironmentBufferData
+cbuffer EnvironmentProperties
 {
     float4x4 cameraViewProjection;
     float4x4 cameraInvProjection;
@@ -41,12 +41,12 @@ cbuffer EnvironmentBufferData
 };
 void main(in  VSInput VSIn, uint InstanceID : SV_InstanceID,  out PSInput PSIn)
 {
-    uint transformIndex = StaticInstanceBufferData[InstanceID].transformIndex;
-    uint materialIndex = StaticInstanceBufferData[InstanceID].materialIndex;
-    float4 TransformedPos = mul(float4(VSIn.Pos, 1.0), TransformBufferData[transformIndex].model);
+    uint transformIndex = StaticInstances[InstanceID].transformIndex;
+    uint materialIndex = StaticInstances[InstanceID].materialIndex;
+    float4 TransformedPos = mul(float4(VSIn.Pos, 1.0), Transforms[transformIndex].model);
     PSIn.Pos = mul(TransformedPos, cameraViewProjection);
     PSIn.UV  = VSIn.UV;
-    PSIn.Normal = normalize(mul(TransformBufferData[transformIndex].model, VSIn.Normal)); // @TODO #805, compute inverse model matrix CPU-side
+    PSIn.Normal = normalize(mul(Transforms[transformIndex].model, VSIn.Normal)); // @TODO #805, compute inverse model matrix CPU-side
     PSIn.WorldPos = TransformedPos.xyz;
     PSIn.MaterialIndex = materialIndex;
 }

resources/shaders/ToonSkinned.vsh

@@ -23,7 +23,7 @@ struct TransformData
     float4x4 modelMatrix;
 };
 
-StructuredBuffer<TransformData> TransformBufferData;
+StructuredBuffer<TransformData> Transforms;
 
 // todo: #802 Define this at compile time
 #define ENABLE_SKINNING 1
@@ -37,17 +37,17 @@ struct SkinnedMeshInstanceData
     uint boneIndex;
 };
 
-StructuredBuffer<SkinnedMeshInstanceData> SkinnedInstanceBufferData;
+StructuredBuffer<SkinnedMeshInstanceData> SkinnedInstances;
 
 #define INSTANCE_DATA SkinnedMeshInstanceData
-#define INSTANCE_BUFFER SkinnedInstanceBufferData
+#define INSTANCE_BUFFER SkinnedInstances
 
 struct BoneData
 {
     float4x4 animatedBoneMatrix;
 };
 
-StructuredBuffer<BoneData> BoneBufferData;
+StructuredBuffer<BoneData> Bones;
 
 bool IsValidBoneIndex(uint boneIndex)
 {
@@ -70,7 +70,7 @@ float4x4 CombineBoneMatrices(uint base, uint4 boneOffsets, float4 boneWeights)
     {
         if (boneWeights[i] > 0.0f)
         {
-            boneTransform += BoneBufferData[base + boneOffsets[i]].animatedBoneMatrix * boneWeights[i];
+            boneTransform += Bones[base + boneOffsets[i]].animatedBoneMatrix * boneWeights[i];
         }
     }
 
@@ -85,14 +85,14 @@ struct StaticMeshInstanceData
     uint materialIndex;
 };
 
-StructuredBuffer<StaticMeshInstanceData> StaticInstanceBufferData;
+StructuredBuffer<StaticMeshInstanceData> StaticInstances;
 
 #define INSTANCE_DATA StaticMeshInstanceData
-#define INSTANCE_BUFFER StaticInstanceBufferData
+#define INSTANCE_BUFFER StaticInstances
 
 #endif // ENABLE_SKINNING
 
-cbuffer EnvironmentBufferData
+cbuffer EnvironmentProperties
 {
     float4x4 cameraViewProjection;
     float4x4 cameraInvProjection;
@@ -121,10 +121,10 @@ void main(in VSInput VSIn, uint InstanceID : SV_InstanceID, out PSInput PSIn)
 #endif // ENABLE_SKINNING
 
     uint transformIndex = instance.transformIndex;
-    float4 worldPos = mul(pos, TransformBufferData[transformIndex].modelMatrix);
+    float4 worldPos = mul(pos, Transforms[transformIndex].modelMatrix);
     PSIn.Pos = mul(worldPos, cameraViewProjection);
     PSIn.UV = VSIn.UV;
-    PSIn.Normal = normalize(mul(TransformBufferData[transformIndex].modelMatrix, normal)); // @TODO #805, compute inverse model matrix CPU-side
+    PSIn.Normal = normalize(mul(Transforms[transformIndex].modelMatrix, normal)); // @TODO #805, compute inverse model matrix CPU-side
     PSIn.WorldPos = worldPos.xyz;
     PSIn.MaterialIndex = instance.materialIndex;
 }

resources/shaders/Wireframe.psh

@@ -1,4 +1,4 @@
-cbuffer WireframeBufferData
+cbuffer WireframeProperties
 {
     float4x4 wireframeModelMatrix;
     float4 wireframeColor;

resources/shaders/Wireframe.vsh

@@ -8,15 +8,15 @@ struct PSInput
     float4 Pos : SV_POSITION;
 };
 
-cbuffer EnvironmentBufferData
+cbuffer EnvironmentProperties
 {
     float4x4 cameraViewProjection;
     float4x4 cameraInvProjection;
     float3 cameraPosition;
     uint lightCount;
 };
 
-cbuffer WireframeBufferData
+cbuffer WireframeProperties
 {
     float4x4 wireframeModelMatrix;
     float4 wireframeColor;