Minor renaming

This commit is contained in:
Wojciech Figat
2022-05-02 12:52:38 +02:00
parent acd064c364
commit ab37cc72a9
6 changed files with 9 additions and 9 deletions

View File

@@ -490,7 +490,7 @@ void MaterialParameter::Bind(BindMeta& meta) const
Platform::MemoryClear(&bindingData, sizeof(bindingData)); Platform::MemoryClear(&bindingData, sizeof(bindingData));
for (int32 i = 0; i < 4; i++) for (int32 i = 0; i < 4; i++)
meta.Context->BindSR(_registerIndex + i, bindingData.Cascades[i] ? bindingData.Cascades[i]->ViewVolume() : nullptr); meta.Context->BindSR(_registerIndex + i, bindingData.Cascades[i] ? bindingData.Cascades[i]->ViewVolume() : nullptr);
*((GlobalSignDistanceFieldPass::GlobalSDFData*)(meta.Constants.Get() + _offset)) = bindingData.GlobalSDF; *((GlobalSignDistanceFieldPass::ConstantsData*)(meta.Constants.Get() + _offset)) = bindingData.GlobalSDF;
break; break;
} }
default: default:

View File

@@ -41,8 +41,8 @@ PACK_STRUCT(struct Data0
float LightShadowsStrength; float LightShadowsStrength;
float ViewFarPlane; float ViewFarPlane;
Vector4 ViewFrustumWorldRays[4]; Vector4 ViewFrustumWorldRays[4];
GlobalSignDistanceFieldPass::GlobalSDFData GlobalSDF; GlobalSignDistanceFieldPass::ConstantsData GlobalSDF;
GlobalSurfaceAtlasPass::GlobalSurfaceAtlasData GlobalSurfaceAtlas; GlobalSurfaceAtlasPass::ConstantsData GlobalSurfaceAtlas;
LightData Light; LightData Light;
}); });

View File

@@ -11,7 +11,7 @@ class FLAXENGINE_API GlobalSurfaceAtlasPass : public RendererPass<GlobalSurfaceA
{ {
public: public:
// Constant buffer data for Global Surface Atlas access on a GPU. // Constant buffer data for Global Surface Atlas access on a GPU.
PACK_STRUCT(struct GlobalSurfaceAtlasData PACK_STRUCT(struct ConstantsData
{ {
Vector3 ViewPos; Vector3 ViewPos;
float Padding0; float Padding0;
@@ -27,7 +27,7 @@ public:
GPUTexture* Atlas[5]; GPUTexture* Atlas[5];
GPUBuffer* Chunks; GPUBuffer* Chunks;
GPUBuffer* CulledObjects; GPUBuffer* CulledObjects;
GlobalSurfaceAtlasData GlobalSurfaceAtlas; ConstantsData GlobalSurfaceAtlas;
}; };
private: private:

View File

@@ -52,7 +52,7 @@ PACK_STRUCT(struct Data
Vector3 Padding00; Vector3 Padding00;
float ViewFarPlane; float ViewFarPlane;
Vector4 ViewFrustumWorldRays[4]; Vector4 ViewFrustumWorldRays[4];
GlobalSignDistanceFieldPass::GlobalSDFData GlobalSDF; GlobalSignDistanceFieldPass::ConstantsData GlobalSDF;
}); });
PACK_STRUCT(struct ModelsRasterizeData PACK_STRUCT(struct ModelsRasterizeData

View File

@@ -11,7 +11,7 @@ class FLAXENGINE_API GlobalSignDistanceFieldPass : public RendererPass<GlobalSig
{ {
public: public:
// Constant buffer data for Global SDF access on a GPU. // Constant buffer data for Global SDF access on a GPU.
PACK_STRUCT(struct GlobalSDFData PACK_STRUCT(struct ConstantsData
{ {
Vector4 CascadePosDistance[4]; Vector4 CascadePosDistance[4];
Vector4 CascadeVoxelSize; Vector4 CascadeVoxelSize;
@@ -24,7 +24,7 @@ public:
{ {
GPUTexture* Cascades[4]; GPUTexture* Cascades[4];
GPUTexture* CascadeMips[4]; GPUTexture* CascadeMips[4];
GlobalSDFData GlobalSDF; ConstantsData GlobalSDF;
}; };
private: private:

View File

@@ -112,7 +112,7 @@ void ShaderGraphUtilities::GenerateShaderConstantBuffer(TextWriterUnicode& write
} }
case MaterialParameterType::GlobalSDF: case MaterialParameterType::GlobalSDF:
zeroRegister = false; zeroRegister = false;
size = sizeof(GlobalSignDistanceFieldPass::GlobalSDFData); size = sizeof(GlobalSignDistanceFieldPass::ConstantsData);
alignment = 16; alignment = 16;
format = TEXT("GlobalSDFData {0};"); format = TEXT("GlobalSDFData {0};");
break; break;