Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 556 vs 557 for /trunk/Source Code/Environment/Terrain/Headers/Terrain.h

Diff revisions: vs.
  @@ -164,7 +164,7 @@
164 164 SamplerDescriptor* _normalSampler;
165 165
166 166 vectorImpl<TerrainChunk*> _terrainChunks;
167 - std::array<size_t, to_const_uint(RenderStage::COUNT)> _terrainStateHash;
167 + std::array<U32, to_const_uint(RenderStage::COUNT)> _terrainStateHash;
168 168 };
169 169
170 170 namespace Attorney {
  @@ -201,9 +201,9 @@
201 201 }
202 202
203 203 static void setRenderStateHashes(Terrain& terrain,
204 - size_t normalStateHash,
205 - size_t reflectionStateHash,
206 - size_t depthStateHash) {
204 + U32 normalStateHash,
205 + U32 reflectionStateHash,
206 + U32 depthStateHash) {
207 207 terrain._terrainStateHash[to_uint(RenderStage::DISPLAY)] = normalStateHash;
208 208 terrain._terrainStateHash[to_uint(RenderStage::Z_PRE_PASS)] = normalStateHash;
209 209 terrain._terrainStateHash[to_uint(RenderStage::REFLECTION)] = reflectionStateHash;