Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 776 vs 777 for /trunk/Source Code/Platform/Video/GFXDevice.cpp

Diff revisions: vs.
  @@ -34,7 +34,6 @@
34 34 _stateDepthOnlyRenderingHash = 0;
35 35 // Pointers
36 36 _axisGizmo = nullptr;
37 - _imShader = nullptr;
38 37 _gfxDataBuffer = nullptr;
39 38 _HIZConstructProgram = nullptr;
40 39 _HIZCullProgram = nullptr;
  @@ -46,8 +45,7 @@
46 45 FRAME_COUNT = 0;
47 46 FRAME_DRAW_CALLS = 0;
48 47 FRAME_DRAW_CALLS_PREV = FRAME_DRAW_CALLS;
49 - _imShaderTextureFlag = -1;
50 - _imShaderWorldMatrix = -1;
48 + _graphicResources = 0;
51 49 // Floats
52 50 _interpolationFactor = 1.0;
53 51 // Cameras
  @@ -652,35 +650,6 @@
652 650 screenTarget.end();
653 651 }
654 652
655 - /// Find an unused primitive object or create a new one and return it
656 - IMPrimitive* GFXDevice::getOrCreatePrimitive(bool allowPrimitiveRecycle) {
657 - UpgradableReadLock ur_lock(_imInterfaceLock);
658 - IMPrimitive* tempPriv = nullptr;
659 - // Find an available and unused primitive (a zombie primitive)
660 - vectorImpl<IMPrimitive*>::iterator it;
661 - it = std::find_if(std::begin(_imInterfaces), std::end(_imInterfaces),
662 - [](IMPrimitive* const priv) {
663 - return (priv && !priv->inUse());
664 - });
665 - // If we allow resurrected primitives check if we have one available
666 - if (allowPrimitiveRecycle && it != std::end(_imInterfaces)) {
667 - tempPriv = *it;
668 - // If we have a valid zombie, resurrect it
669 - tempPriv->clear();
670 -
671 - } else {
672 - // If we do not have a valid zombie, we create a new primitive
673 - tempPriv = newIMP();
674 - // And add it to our container. The GFXDevice class is responsible for deleting these!
675 - UpgradeToWriteLock w_lock(ur_lock);
676 - _imInterfaces.push_back(tempPriv);
677 - }
678 - // Toggle zombification of the primitive on or off depending on our request
679 - tempPriv->_canZombify = allowPrimitiveRecycle;
680 -
681 - return tempPriv;
682 - }
683 -
684 653 /// Extract the pixel data from the main render target's first colour attachment
685 654 /// and save it as a TGA image
686 655 void GFXDevice::Screenshot(const stringImpl& filename) {