Adapt to Magnum changes.

mosra · Mar 13, 2020 · a26f0ea · a26f0ea
1 parent 5eb7916
commit a26f0ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Magnum/BulletIntegration/DebugDraw.cpp b/src/Magnum/BulletIntegration/DebugDraw.cpp
@@ -124,9 +124,10 @@ void DebugDraw::flushLines() {
     _buffer.setData(_bufferData, GL::BufferUsage::DynamicDraw);
 
     /* Update shader and draw */
-    _shader.setTransformationProjectionMatrix(_transformationProjectionMatrix);
-    _mesh.setCount(_bufferData.size()/2)
-         .draw(_shader);
+    _mesh.setCount(_bufferData.size()/2);
+    _shader
+        .setTransformationProjectionMatrix(_transformationProjectionMatrix)
+        .draw(_mesh);
 
     /* Clear buffer to receive new data */
     arrayResize(_bufferData, 0);

diff --git a/src/Magnum/ImGuiIntegration/Context.cpp b/src/Magnum/ImGuiIntegration/Context.cpp
@@ -320,9 +320,6 @@ void Context::drawFrame() {
         for(std::int_fast32_t c = 0; c < cmdList->CmdBuffer.Size; ++c) {
             const ImDrawCmd* pcmd = &cmdList->CmdBuffer[c];
 
-            auto userTexture = static_cast<GL::Texture2D*>(pcmd->TextureId);
-            _shader.bindTexture(*userTexture);
-
             GL::Renderer::setScissor(Range2Di{Range2D{
                 {pcmd->ClipRect.x, fbSize.y() - pcmd->ClipRect.w},
                 {pcmd->ClipRect.z, fbSize.y() - pcmd->ClipRect.y}}
@@ -336,7 +333,9 @@ void Context::drawFrame() {
 
             indexBufferOffset += pcmd->ElemCount;
 
-            _mesh.draw(_shader);
+            _shader
+                .bindTexture(*static_cast<GL::Texture2D*>(pcmd->TextureId))
+                .draw(_mesh);
         }
     }