[WIP] Renderer backend selection #877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

revmischa wants to merge 26 commits into master from renderer-backend

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -59,3 +59,4 @@ src/libprojectM/build/ @@
     # CLion
     cmake-build-*
     .idea
+    .aider*

src/libprojectM/MilkdropPreset/Border.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,10 +9,9 @@ namespace MilkdropPreset {
  
    Border::Border(PresetState& presetState)

        : m_presetState(presetState)

        , m_borderMesh(Renderer::VertexBufferUsage::StreamDraw)

    {

        m_borderMesh.SetRenderPrimitiveType(Renderer::Mesh::PrimitiveType::Triangles);

        m_borderMesh.SetVertexCount(8);

        Init();

    }

        m_borderMesh.Indices().Set({

        {

src/libprojectM/MilkdropPreset/Border.hpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,16 +2,15 @@
  
    #include "PresetState.hpp"

    #include <Renderer/Mesh.hpp>

    #include <Renderer/Backend/OpenGL/OpenGLRenderItem.hpp>

    namespace libprojectM {

    namespace MilkdropPreset {

    /**

     * @brief Renders a border around the screen.

     */

    class Border

    class Border : public libprojectM::Renderer::Backend::OpenGL::OpenGLRenderItem

    {

    public:

        Border() = delete;

src/libprojectM/MilkdropPreset/CustomShape.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,8 +19,37 @@ CustomShape::CustomShape(PresetState& presetState) @@
         m_outlineMesh.SetVertexCount(100);
         m_outlineMesh.SetRenderPrimitiveType(Renderer::Mesh::PrimitiveType::LineLoop);
-        m_fillMesh.SetVertexCount(102);
-        m_fillMesh.SetRenderPrimitiveType(Renderer::Mesh::PrimitiveType::TriangleFan);
+        glGenVertexArrays(1, &m_vaoIdTextured);
+        glGenBuffers(1, &m_vboIdTextured);
+        glGenVertexArrays(1, &m_vaoIdUntextured);
+        glGenBuffers(1, &m_vboIdUntextured);
+        glBindVertexArray(m_vaoIdTextured);
+        glBindBuffer(GL_ARRAY_BUFFER, m_vboIdTextured);
+        glEnableVertexAttribArray(0);
+        glEnableVertexAttribArray(1);
+        glEnableVertexAttribArray(2);
+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(TexturedPoint), reinterpret_cast<void*>(offsetof(TexturedPoint, x))); // Position
+        glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(TexturedPoint), reinterpret_cast<void*>(offsetof(TexturedPoint, r))); // Color
+        glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(TexturedPoint), reinterpret_cast<void*>(offsetof(TexturedPoint, u))); // Texture coordinate
+        glBufferData(GL_ARRAY_BUFFER, sizeof(TexturedPoint) * vertexData.size(), vertexData.data(), GL_STREAM_DRAW);
+        glBindVertexArray(m_vaoIdUntextured);
+        glBindBuffer(GL_ARRAY_BUFFER, m_vboIdUntextured);
+        glEnableVertexAttribArray(0);
+        glEnableVertexAttribArray(1);
+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(TexturedPoint), reinterpret_cast<void*>(offsetof(TexturedPoint, x))); // Position
+        glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(TexturedPoint), reinterpret_cast<void*>(offsetof(TexturedPoint, r))); // Color
+        glBufferData(GL_ARRAY_BUFFER, sizeof(TexturedPoint) * vertexData.size(), vertexData.data(), GL_STREAM_DRAW);
+        Init();
         m_perFrameContext.RegisterBuiltinVariables();
     }
@@ Expand Down @@

src/libprojectM/MilkdropPreset/CustomShape.hpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,8 +4,8 @@
  
    #include "PresetState.hpp"

    #include "ShapePerFrameContext.hpp"

    #include <Renderer/Mesh.hpp>

    #include <Renderer/RenderItem.hpp>

    #include <Renderer/Backend/OpenGL/OpenGLRenderItem.hpp>

    #include <projectm-eval.h>

    namespace libprojectM {

    @@ -19,7 +19,7 @@ class PresetFileParser;
  
     * The class creates two sets of VBO/VAO as it's only known later (in the Draw() call) whether the shape is textured

     * or not.

     */

    class CustomShape

    class CustomShape : public libprojectM::Renderer::Backend::OpenGL::OpenGLRenderItem

    {

    public:

        CustomShape(PresetState& presetState);

src/libprojectM/MilkdropPreset/CustomWaveform.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,8 @@ CustomWaveform::CustomWaveform(PresetState& presetState) @@
         , m_perPointContext(presetState.globalMemory, &presetState.globalRegisters)
         , m_mesh(Renderer::VertexBufferUsage::StreamDraw, true, false)
     {
+        Init();
         m_perFrameContext.RegisterBuiltinVariables();
         m_perPointContext.RegisterBuiltinVariables();
@@ Expand Down @@

src/libprojectM/MilkdropPreset/CustomWaveform.hpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,9 +3,7 @@
  
    #include "WaveformPerFrameContext.hpp"

    #include "WaveformPerPointContext.hpp"

    #include <Renderer/Color.hpp>

    #include <Renderer/Mesh.hpp>

    #include <Renderer/Point.hpp>

    #include <Renderer/Backend/OpenGL/OpenGLRenderItem.hpp>

    #include <vector>

    @@ -14,7 +12,9 @@ namespace MilkdropPreset {
  
    class PresetFileParser;

    class CustomWaveform

    namespace MilkdropPreset {

    class CustomWaveform : public libprojectM::Renderer::Backend::OpenGL::OpenGLRenderItem

    {

    public:

    @@ -24,12 +24,14 @@ class CustomWaveform
  
         */

        explicit CustomWaveform(PresetState& presetState);

        void InitVertexAttrib() override;

        /**

         * @brief Loads the initial values and code from the preset file.

         * @param parsedFile The file parser with the preset data.

         * @param index The waveform index.

         */

        void Initialize(PresetFileParser& parsedFile, int index);

        void Initialize(::libprojectM::PresetFileParser& parsedFile, int index);

        /**

         * @brief Compiles all code blocks and runs the init expression.

    @@ -69,10 +71,12 @@ class CustomWaveform
  
         *

         * Roughly doubles the number of points.

         *

         * @param points A vector of points to be smoothed.

         * @param colors A vector of colors for the points.

         * @param inputVertices Array of input vertices to be smoothed.

         * @param vertexCount Number of vertices in the input array.

         * @param outputVertices Array to store the smoothed vertices.

         * @return The number of vertices in the output array.

         */

        void SmoothWave(const std::vector<Renderer::Point>& points, const std::vector<Renderer::Color>& colors);

        static int SmoothWave(const ColoredPoint* inputVertices, int vertexCount, ColoredPoint* outputVertices);

        int m_index{0}; //!< Custom waveform index in the preset.

        bool m_enabled{false}; //!< Render waveform if non-zero.

src/libprojectM/MilkdropPreset/DarkenCenter.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,17 +7,17 @@ namespace MilkdropPreset { @@
     DarkenCenter::DarkenCenter(PresetState& presetState)
         : m_presetState(presetState)
-        , m_mesh(Renderer::VertexBufferUsage::StaticDraw, true, false)
     {
-        m_mesh.SetRenderPrimitiveType(Renderer::Mesh::PrimitiveType::TriangleFan);
-        m_mesh.SetVertexCount(6);
-        m_mesh.Colors().Set({{0.0f, 0.0f, 0.0f, 3.0f / 32.0f},
-                             {0.0f, 0.0f, 0.0f, 0.0f},
-                             {0.0f, 0.0f, 0.0f, 0.0f},
-                             {0.0f, 0.0f, 0.0f, 0.0f},
-                             {0.0f, 0.0f, 0.0f, 0.0f},
-                             {0.0f, 0.0f, 0.0f, 0.0f}});
-        m_mesh.Update();
+        Init();
+    }
+    void DarkenCenter::InitVertexAttrib()
+    {
+        glEnableVertexAttribArray(0);
+        glEnableVertexAttribArray(1);
+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(ColoredPoint), nullptr);                                            // points
+        glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(ColoredPoint), reinterpret_cast<void*>(offsetof(ColoredPoint, r))); // colors
     }
     void DarkenCenter::Draw()
@@ Expand Down @@

src/libprojectM/MilkdropPreset/DarkenCenter.hpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,21 +2,23 @@
  
    #include "PresetState.hpp"

    #include <Renderer/Mesh.hpp>

    #include <Renderer/Backend/OpenGL/OpenGLRenderItem.hpp>

    namespace libprojectM {

    namespace MilkdropPreset {

    /**

     * @brief Darkens the screen center a bit on each frame.

     */

    class DarkenCenter

    class DarkenCenter : public libprojectM::Renderer::Backend::OpenGL::OpenGLRenderItem

    {

    public:

        DarkenCenter() = delete;

        explicit DarkenCenter(PresetState& presetState);

        void InitVertexAttrib() override;

        /**

         * Applies the darkening area.

         */

src/libprojectM/MilkdropPreset/Filters.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,10 +9,16 @@ namespace MilkdropPreset { @@
     Filters::Filters(const PresetState& presetState)
         : m_presetState(presetState)
-        , m_filterMesh(Renderer::VertexBufferUsage::StaticDraw)
     {
-        m_filterMesh.SetRenderPrimitiveType(Renderer::Mesh::PrimitiveType::TriangleStrip);
-        m_filterMesh.SetVertexCount(4);
+        Init();
+    }
+    void Filters::InitVertexAttrib()
+    {
+        glEnableVertexAttribArray(0);
+        glDisableVertexAttribArray(1);
+        glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(Point), reinterpret_cast<void*>(offsetof(Point, x)));
     }
     void Filters::Draw()
@@ Expand Down @@

src/libprojectM/MilkdropPreset/Filters.hpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,20 +2,22 @@
  
    #include "PresetState.hpp"

    #include <Renderer/Mesh.hpp>

    #include <Renderer/Backend/OpenGL/OpenGLRenderItem.hpp>

    namespace libprojectM {

    namespace MilkdropPreset {

    /**

     * @brief Classic Milkdrop 1 postprocessing effects.

     */

    class Filters

    class Filters : public libprojectM::Renderer::Backend::OpenGL::OpenGLRenderItem

    {

    public:

        Filters() = delete;

        explicit Filters(const PresetState& presetState);

        void InitVertexAttrib() override;

        /**

         * @brief Applies the configured filters to the current output.

         */

src/libprojectM/MilkdropPreset/FinalComposite.cpp

-Original file line number
+Diff line change
@@ Expand Up @@
     FinalComposite::FinalComposite()
         : m_compositeMesh(Renderer::VertexBufferUsage::StreamDraw, true, true)
     {
-        m_compositeMesh.SetRenderPrimitiveType(Renderer::Mesh::PrimitiveType::Triangles);
+        Init();
+    }
         // Add attribute array for radius and angle information to the mesh.
         m_compositeMesh.Bind();
@@ Expand Down @@

src/libprojectM/MilkdropPreset/FinalComposite.hpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,7 +4,7 @@
  
    #include "MilkdropShader.hpp"

    #include "VideoEcho.hpp"

    #include <Renderer/Mesh.hpp>

    #include <Renderer/Backend/OpenGL/OpenGLRenderItem.hpp>

    #include <memory>

    @@ -14,11 +14,13 @@ namespace MilkdropPreset {
  
    /**

     * @brief Draws the final composite effect, either a shader or Milkdrop 1 effects.

     */

    class FinalComposite

    class FinalComposite : public libprojectM::Renderer::Backend::OpenGL::OpenGLRenderItem

    {

    public:

        FinalComposite();

        void InitVertexAttrib() override;

        /**

         * @brief Loads the composite shader, if the preset uses one.

         * @param presetState The preset state to retrieve the shader from.

src/libprojectM/MilkdropPreset/MilkdropPreset.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -24,6 +24,7 @@
  
    #include "Factory.hpp"

    #include "MilkdropPresetExceptions.hpp"

    #include "PresetFileParser.hpp"

    #include <Renderer/Backend/OpenGL/OpenGLCopyTexture.hpp>

    #include <Logging.hpp>

    @@ -38,7 +39,10 @@ MilkdropPreset::MilkdropPreset(const std::string& absoluteFilePath)
  
        , m_waveform(m_state)

        , m_darkenCenter(m_state)

        , m_border(m_state)

        , m_flipTexture(std::make_unique<libprojectM::Renderer::Backend::OpenGL::OpenGLCopyTexture>())

    {

        // Ensure OpenGLCopyTexture is visible to this translation unit

        // (include the header if not already included at the top of this file)

        Load(absoluteFilePath);

    }

    @@ -49,7 +53,10 @@ MilkdropPreset::MilkdropPreset(std::istream& presetData)
  
        , m_waveform(m_state)

        , m_darkenCenter(m_state)

        , m_border(m_state)

        , m_flipTexture(std::make_unique<libprojectM::Renderer::Backend::OpenGL::OpenGLCopyTexture>())

    {

        // Ensure OpenGLCopyTexture is visible to this translation unit

        // (include the header if not already included at the top of this file)

        Load(presetData);

    }

    @@ -103,8 +110,8 @@ void MilkdropPreset::RenderFrame(const libprojectM::Audio::FrameAudioData& audio
  
        }

        // y-flip the previous frame and assign the flipped texture as "main"

        m_flipTexture.Draw(*renderContext.shaderCache, m_framebuffer.GetColorAttachmentTexture(m_previousFrameBuffer, 0), nullptr, true, false);

        m_state.mainTexture = m_flipTexture.Texture();

        m_flipTexture->Draw(m_framebuffer.GetColorAttachmentTexture(m_previousFrameBuffer, 0), nullptr, true, false);

        m_state.mainTexture = m_flipTexture->Texture();

        // We now draw to the current framebuffer.

        m_framebuffer.Bind(m_currentFrameBuffer);

    @@ -144,8 +151,8 @@ void MilkdropPreset::RenderFrame(const libprojectM::Audio::FrameAudioData& audio
  
        m_border.Draw(m_perFrameContext);

        // y-flip the image for final compositing again

        m_flipTexture.Draw(*renderContext.shaderCache, m_framebuffer.GetColorAttachmentTexture(m_currentFrameBuffer, 0), nullptr, true, false);

        m_state.mainTexture = m_flipTexture.Texture();

        m_flipTexture->Draw(m_framebuffer.GetColorAttachmentTexture(m_currentFrameBuffer, 0), nullptr, true, false);

        m_state.mainTexture = m_flipTexture->Texture();

        // We no longer need the previous frame image, use it to render the final composite.

        m_framebuffer.BindRead(m_currentFrameBuffer);

    @@ -156,7 +163,7 @@ void MilkdropPreset::RenderFrame(const libprojectM::Audio::FrameAudioData& audio
  
        if (!m_finalComposite.HasCompositeShader())

        {

            // Flip texture again in "previous" framebuffer as old-school effects are still upside down.

            m_flipTexture.Draw(*renderContext.shaderCache, m_framebuffer.GetColorAttachmentTexture(m_previousFrameBuffer, 0), m_framebuffer, m_previousFrameBuffer, true, false);

            m_flipTexture->Draw(m_framebuffer.GetColorAttachmentTexture(m_previousFrameBuffer, 0), m_framebuffer, m_previousFrameBuffer, true, false);

        }

        // Swap framebuffer IDs for the next frame.

    @@ -168,15 +175,15 @@ void MilkdropPreset::RenderFrame(const libprojectM::Audio::FrameAudioData& audio
  
    auto MilkdropPreset::OutputTexture() const -> std::shared_ptr<Renderer::Texture>

    {

        // the composited image is always stored in the "current" framebuffer after a frame is rendered.

        return m_framebuffer.GetColorAttachmentTexture(m_currentFrameBuffer, 0);

        return m_flipTexture->Texture();

    }

    void MilkdropPreset::DrawInitialImage(const std::shared_ptr<Renderer::Texture>& image, const Renderer::RenderContext& renderContext)

    {

        m_framebuffer.SetSize(renderContext.viewportSizeX, renderContext.viewportSizeY);

        // Render to previous framebuffer, as this is the image used to draw the next frame on.

        m_flipTexture.Draw(*renderContext.shaderCache, image, m_framebuffer, m_previousFrameBuffer);

        m_flipTexture->Draw(image, m_framebuffer, m_previousFrameBuffer);

    }

    void MilkdropPreset::BindFramebuffer()

src/libprojectM/MilkdropPreset/MilkdropPreset.hpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -124,7 +124,7 @@ class MilkdropPreset : public ::libprojectM::Preset
  
        std::array<std::unique_ptr<CustomShape>, CustomShapeCount> m_customShapes;          //!< Custom shapes in this preset.

        DarkenCenter m_darkenCenter;                                                        //!< Center darkening effect.

        Border m_border;                                                                    //!< Inner/outer borders.

        Renderer::CopyTexture m_flipTexture;                                                //!< Texture flip filter

        std::unique_ptr<Renderer::CopyTexture> m_flipTexture;                               //!< Texture flip filter

        FinalComposite m_finalComposite; //!< Final composite shader or filters.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[WIP] Renderer backend selection #877

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

[WIP] Renderer backend selection #877

Are you sure you want to change the base?

Uh oh!

[WIP] Renderer backend selection #877

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!