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/Platform/Video/GFXDevice.cpp

Diff revisions: vs.
  @@ -194,7 +194,7 @@
194 194 /// If the stateBlock doesn't exist in the state block map, add it for future reference
195 195 bool GFXDevice::registerRenderStateBlock(const RenderStateBlock& descriptor) {
196 196 // Each combination of render states has a unique hash value
197 - size_t hashValue = descriptor.getHash();
197 + U32 hashValue = descriptor.getHash();
198 198 // Find the corresponding render state block
199 199 // Create a new one if none are found. The GFXDevice class is
200 200 // responsible for deleting these!
  @@ -205,7 +205,7 @@
205 205 }
206 206
207 207 /// Activate the render state block described by the specified hash value (0 == default state block)
208 - size_t GFXDevice::setStateBlock(size_t stateBlockHash) {
208 + U32 GFXDevice::setStateBlock(U32 stateBlockHash) {
209 209 // Passing 0 is a perfectly acceptable way of enabling the default render state block
210 210 if (stateBlockHash == 0) {
211 211 stateBlockHash = _defaultStateBlockHash;
  @@ -233,7 +233,7 @@
233 233 }
234 234
235 235 /// Return the the render state block defined by the specified hash value.
236 - const RenderStateBlock& GFXDevice::getRenderStateBlock(size_t renderStateBlockHash) const {
236 + const RenderStateBlock& GFXDevice::getRenderStateBlock(U32 renderStateBlockHash) const {
237 237 // Find the render state block associated with the received hash value
238 238 RenderStateMap::const_iterator it = _stateBlockMap.find(renderStateBlockHash);
239 239 // Assert if it doesn't exist. Avoids programming errors.
  @@ -494,7 +494,7 @@
494 494 /// (orthographic projection, no depth reads)
495 495 void GFXDevice::toggle2D(bool state) {
496 496 // Remember the previous state hash
497 - static size_t previousStateBlockHash = 0;
497 + static U32 previousStateBlockHash = 0;
498 498 // Prevent double 2D toggle to the same state (e.g. in a loop)
499 499 if (state == _2DRendering) {
500 500 return;