Adapt to GL shader renaming.

mosra · May 1, 2021 · 73018a6 · 73018a6
1 parent f56b925
commit 73018a6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/doc/changelog-integration.dox b/doc/changelog-integration.dox
@@ -116,8 +116,9 @@ Released 2020-06-27, tagged as
     header is not included by any other header to avoid trigerring a full
     rebuild when Git commit changes. If Git is not found, only the first two
     defines are present.
--   @ref ImGuiIntegration now uses Magnum's own @ref Shaders::Flat2D instead of
-    a custom shader, which finally makes it work on GLES2 and WebGL 1
+-   @ref ImGuiIntegration now uses Magnum's own @cpp Shaders::Flat2D @ce
+    instead of a custom shader, which finally makes it work on GLES2 and WebGL
+    1
 
 @subsection changelog-integration-2020-06-buildsystem Build system
 

diff --git a/src/Magnum/BulletIntegration/DebugDraw.cpp b/src/Magnum/BulletIntegration/DebugDraw.cpp
@@ -64,7 +64,7 @@ Debug& operator<<(Debug& debug, const DebugDraw::Mode value) {
 }
 
 DebugDraw::DebugDraw(const std::size_t initialBufferCapacity): _mesh{GL::MeshPrimitive::Lines} {
-    _mesh.addVertexBuffer(_buffer, 0, Shaders::VertexColor3D::Position{}, Shaders::VertexColor3D::Color3{});
+    _mesh.addVertexBuffer(_buffer, 0, Shaders::VertexColorGL3D::Position{}, Shaders::VertexColorGL3D::Color3{});
     arrayReserve(_bufferData, initialBufferCapacity*4);
 }
 

diff --git a/src/Magnum/BulletIntegration/DebugDraw.h b/src/Magnum/BulletIntegration/DebugDraw.h
@@ -36,7 +36,7 @@
 #include <Magnum/GL/Buffer.h>
 #include <Magnum/GL/Mesh.h>
 #include <Magnum/Math/Matrix4.h>
-#include <Magnum/Shaders/VertexColor.h>
+#include <Magnum/Shaders/VertexColorGL.h>
 
 #include "Magnum/BulletIntegration/Integration.h"
 
@@ -136,7 +136,7 @@ class MAGNUM_BULLETINTEGRATION_EXPORT DebugDraw: public btIDebugDraw {
          * @param initialBufferCapacity     Amount of lines for which to
          *      reserve memory in the buffer vector.
          *
-         * Sets up @ref Shaders::VertexColor3D, @ref GL::Buffer and
+         * Sets up @ref Shaders::VertexColorGL3D, @ref GL::Buffer and
          * @ref GL::Mesh for physics debug rendering.
          */
         explicit DebugDraw(std::size_t initialBufferCapacity = 0);
@@ -212,7 +212,7 @@ class MAGNUM_BULLETINTEGRATION_EXPORT DebugDraw: public btIDebugDraw {
         Modes _mode{};
 
         Matrix4 _transformationProjectionMatrix;
-        Shaders::VertexColor3D _shader;
+        Shaders::VertexColorGL3D _shader;
 
         GL::Buffer _buffer;
         GL::Mesh _mesh;

diff --git a/src/Magnum/ImGuiIntegration/Context.cpp b/src/Magnum/ImGuiIntegration/Context.cpp
@@ -53,7 +53,7 @@ Context::Context(const Vector2& size, const Vector2i& windowSize, const Vector2i
 
 Context::Context(const Vector2i& size): Context{Vector2{size}, size, size} {}
 
-Context::Context(ImGuiContext& context, const Vector2& size, const Vector2i& windowSize, const Vector2i& framebufferSize): _context{&context}, _shader{Shaders::Flat2D::Flag::Textured|Shaders::Flat2D::Flag::VertexColor} {
+Context::Context(ImGuiContext& context, const Vector2& size, const Vector2i& windowSize, const Vector2i& framebufferSize): _context{&context}, _shader{Shaders::FlatGL2D::Flag::Textured|Shaders::FlatGL2D::Flag::VertexColor} {
     /* Ensure we use the context we're linked to */
     ImGui::SetCurrentContext(&context);
 
@@ -98,11 +98,11 @@ Context::Context(ImGuiContext& context, const Vector2& size, const Vector2i& win
 
     _mesh.setPrimitive(GL::MeshPrimitive::Triangles);
     _mesh.addVertexBuffer(_vertexBuffer, 0,
-        Shaders::Flat2D::Position{},
-        Shaders::Flat2D::TextureCoordinates{},
-        Shaders::Flat2D::Color4{
-            Shaders::Flat2D::Color4::DataType::UnsignedByte,
-            Shaders::Flat2D::Color4::DataOption::Normalized});
+        Shaders::FlatGL2D::Position{},
+        Shaders::FlatGL2D::TextureCoordinates{},
+        Shaders::FlatGL2D::Color4{
+            Shaders::FlatGL2D::Color4::DataType::UnsignedByte,
+            Shaders::FlatGL2D::Color4::DataOption::Normalized});
 
     _timeline.start();
 }

diff --git a/src/Magnum/ImGuiIntegration/Context.h b/src/Magnum/ImGuiIntegration/Context.h
@@ -38,7 +38,7 @@
 #include <Magnum/GL/Texture.h>
 #include <Magnum/GL/Buffer.h>
 #include <Magnum/GL/Mesh.h>
-#include <Magnum/Shaders/Flat.h>
+#include <Magnum/Shaders/FlatGL.h>
 
 #include "Magnum/ImGuiIntegration/visibility.h"
 
@@ -540,7 +540,7 @@ class MAGNUM_IMGUIINTEGRATION_EXPORT Context {
 
     private:
         ImGuiContext* _context;
-        Shaders::Flat2D _shader;
+        Shaders::FlatGL2D _shader;
         GL::Texture2D _texture{NoCreate};
         GL::Buffer _vertexBuffer{GL::Buffer::TargetHint::Array};
         GL::Buffer _indexBuffer{GL::Buffer::TargetHint::ElementArray};