Pass discard flag to buffer "unlock" on OpenGL. Closes #1706.

Source/Urho3D/Graphics/IndexBuffer.h

@@ -113,6 +113,8 @@ private:
     bool dynamic_;
     /// Shadowed flag.
     bool shadowed_;
+    /// Discard lock flag. Used by OpenGL only.
+    bool discardLock_;
 };
 
 }

Source/Urho3D/Graphics/OpenGL/OGLIndexBuffer.cpp

@@ -181,6 +181,7 @@ void* IndexBuffer::Lock(unsigned start, unsigned count, bool discard)
 
     lockStart_ = start;
     lockCount_ = count;
+    discardLock_ = discard;
 
     if (shadowData_)
     {
@@ -202,12 +203,12 @@ void IndexBuffer::Unlock()
     switch (lockState_)
     {
     case LOCK_SHADOW:
-        SetDataRange(shadowData_.Get() + lockStart_ * indexSize_, lockStart_, lockCount_);
+        SetDataRange(shadowData_.Get() + lockStart_ * indexSize_, lockStart_, lockCount_, discardLock_);
         lockState_ = LOCK_NONE;
         break;
 
     case LOCK_SCRATCH:
-        SetDataRange(lockScratchData_, lockStart_, lockCount_);
+        SetDataRange(lockScratchData_, lockStart_, lockCount_, discardLock_);
         if (graphics_)
             graphics_->FreeScratchBuffer(lockScratchData_);
         lockScratchData_ = 0;

Source/Urho3D/Graphics/OpenGL/OGLVertexBuffer.cpp

@@ -184,6 +184,7 @@ void* VertexBuffer::Lock(unsigned start, unsigned count, bool discard)
 
     lockStart_ = start;
     lockCount_ = count;
+    discardLock_ = discard;
 
     if (shadowData_)
     {
@@ -205,12 +206,12 @@ void VertexBuffer::Unlock()
     switch (lockState_)
     {
     case LOCK_SHADOW:
-        SetDataRange(shadowData_.Get() + lockStart_ * vertexSize_, lockStart_, lockCount_);
+        SetDataRange(shadowData_.Get() + lockStart_ * vertexSize_, lockStart_, lockCount_, discardLock_);
         lockState_ = LOCK_NONE;
         break;
 
     case LOCK_SCRATCH:
-        SetDataRange(lockScratchData_, lockStart_, lockCount_);
+        SetDataRange(lockScratchData_, lockStart_, lockCount_, discardLock_);
         if (graphics_)
             graphics_->FreeScratchBuffer(lockScratchData_);
         lockScratchData_ = 0;

Source/Urho3D/Graphics/VertexBuffer.h

@@ -165,6 +165,8 @@ private:
     bool dynamic_;
     /// Shadowed flag.
     bool shadowed_;
+    /// Discard lock flag. Used by OpenGL only.
+    bool discardLock_;
 };
 
 }