Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Textures rendering

resources/shaders/flat_texture.fs

@@ -0,0 +1,10 @@
+#version 110
+
+uniform sampler2D uniform_texture;
+
+varying vec2 tex_coord;
+
+void main()
+{
+    gl_FragColor = texture2D(uniform_texture, tex_coord);
+}

resources/shaders/flat_texture.vs

@@ -0,0 +1,9 @@
+#version 110
+
+varying vec2 tex_coord;
+
+void main()
+{
+    gl_Position = ftransform();
+	tex_coord = gl_MultiTexCoord0.xy;
+}

src/slic3r/GUI/GLCanvas3D.cpp

@@ -5229,12 +5229,11 @@ void GLCanvas3D::_render_background()
 #if ENABLE_GLBEGIN_GLEND_REMOVAL
     const ColorRGBA bottom_color = use_error_color ? ERROR_BG_DARK_COLOR : DEFAULT_BG_DARK_COLOR;
 
-    if (!m_background.is_initialized() || m_background.get_color() != bottom_color) {
+    if (!m_background.is_initialized()) {
         m_background.reset();
 
         GLModel::Geometry init_data;
         init_data.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P2T2, GLModel::Geometry::EIndexType::USHORT };
-        init_data.color = bottom_color;
         init_data.vertices.reserve(4 * GLModel::Geometry::vertex_stride_floats(init_data.format));
         init_data.indices.reserve(6 * GLModel::Geometry::index_stride_bytes(init_data.format));
 

src/slic3r/GUI/GLShadersManager.cpp

@@ -36,6 +36,8 @@ std::pair<bool, std::string> GLShadersManager::init()
 #if ENABLE_GLBEGIN_GLEND_REMOVAL
     // basic shader, used to render all what was previously rendered using the immediate mode
     valid &= append_shader("flat", { "flat.vs", "flat.fs" });
+    // basic shader for textures, used to render textures
+    valid &= append_shader("flat_texture", { "flat_texture.vs", "flat_texture.fs" });
     // used to render 3D scene background
     valid &= append_shader("background", { "background.vs", "background.fs" });
 #endif // ENABLE_GLBEGIN_GLEND_REMOVAL

src/slic3r/GUI/GLTexture.cpp

@@ -3,6 +3,10 @@
 
 #include "3DScene.hpp"
 #include "OpenGLManager.hpp"
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+#include "GUI_App.hpp"
+#include "GLModel.hpp"
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 
 #include <GL/glew.h>
 
@@ -120,11 +124,7 @@ void GLTexture::Compressor::compress()
 GLTexture::Quad_UVs GLTexture::FullTextureUVs = { { 0.0f, 1.0f }, { 1.0f, 1.0f }, { 1.0f, 0.0f }, { 0.0f, 0.0f } };
 
 GLTexture::GLTexture()
-    : m_id(0)
-    , m_width(0)
-    , m_height(0)
-    , m_source("")
-    , m_compressor(*this)
+    : m_compressor(*this)
 {
 }
 
@@ -339,12 +339,39 @@ void GLTexture::render_sub_texture(unsigned int tex_id, float left, float right,
 
     glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)tex_id));
 
+#if ENABLE_GLBEGIN_GLEND_REMOVAL
+    GLModel::Geometry init_data;
+    init_data.format = { GLModel::Geometry::EPrimitiveType::Triangles, GLModel::Geometry::EVertexLayout::P2T2, GLModel::Geometry::EIndexType::USHORT };
+    init_data.vertices.reserve(4 * GLModel::Geometry::vertex_stride_floats(init_data.format));
+    init_data.indices.reserve(6 * GLModel::Geometry::index_stride_bytes(init_data.format));
+
+    // vertices
+    init_data.add_vertex(Vec2f(left, bottom),  Vec2f(uvs.left_bottom.u, uvs.left_bottom.v));
+    init_data.add_vertex(Vec2f(right, bottom), Vec2f(uvs.right_bottom.u, uvs.right_bottom.v));
+    init_data.add_vertex(Vec2f(right, top),    Vec2f(uvs.right_top.u, uvs.right_top.v));
+    init_data.add_vertex(Vec2f(left, top),     Vec2f(uvs.left_top.u, uvs.left_top.v));
+
+    // indices
+    init_data.add_ushort_triangle(0, 1, 2);
+    init_data.add_ushort_triangle(2, 3, 0);
+
+    GLModel model;
+    model.init_from(std::move(init_data));
+
+    GLShaderProgram* shader = wxGetApp().get_shader("flat_texture");
+    if (shader != nullptr) {
+        shader->start_using();
+        model.render();
+        shader->stop_using();
+    }
+#else
     ::glBegin(GL_QUADS);
     ::glTexCoord2f(uvs.left_bottom.u, uvs.left_bottom.v); ::glVertex2f(left, bottom);
     ::glTexCoord2f(uvs.right_bottom.u, uvs.right_bottom.v); ::glVertex2f(right, bottom);
     ::glTexCoord2f(uvs.right_top.u, uvs.right_top.v); ::glVertex2f(right, top);
     ::glTexCoord2f(uvs.left_top.u, uvs.left_top.v); ::glVertex2f(left, top);
     glsafe(::glEnd());
+#endif // ENABLE_GLBEGIN_GLEND_REMOVAL
 
     glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 

src/slic3r/GUI/GLTexture.hpp

@@ -64,8 +64,8 @@ namespace GUI {
 
         struct UV
         {
-            float u;
-            float v;
+            float u{ 0.0f };
+            float v{ 0.0f };
         };
 
         struct Quad_UVs
@@ -79,9 +79,9 @@ namespace GUI {
         static Quad_UVs FullTextureUVs;
 
     protected:
-        unsigned int m_id;
-        int m_width;
-        int m_height;
+        unsigned int m_id{ 0 };
+        int m_width{ 0 };
+        int m_height{ 0 };
         std::string m_source;
         Compressor m_compressor;
 

src/slic3r/GUI/Gizmos/GLGizmosManager.cpp

@@ -954,28 +954,27 @@ void GLGizmosManager::update_after_undo_redo(const UndoRedo::Snapshot& snapshot)
 
 void GLGizmosManager::render_background(float left, float top, float right, float bottom, float border) const
 {
-    unsigned int tex_id = m_background_texture.texture.get_id();
-    float tex_width = (float)m_background_texture.texture.get_width();
-    float tex_height = (float)m_background_texture.texture.get_height();
-    if ((tex_id != 0) && (tex_width > 0) && (tex_height > 0))
-    {
-        float inv_tex_width = (tex_width != 0.0f) ? 1.0f / tex_width : 0.0f;
-        float inv_tex_height = (tex_height != 0.0f) ? 1.0f / tex_height : 0.0f;
+    const unsigned int tex_id = m_background_texture.texture.get_id();
+    const float tex_width = float(m_background_texture.texture.get_width());
+    const float tex_height = float(m_background_texture.texture.get_height());
+    if (tex_id != 0 && tex_width > 0 && tex_height > 0) {
+        const float inv_tex_width = (tex_width != 0.0f) ? 1.0f / tex_width : 0.0f;
+        const float inv_tex_height = (tex_height != 0.0f) ? 1.0f / tex_height : 0.0f;
 
-        float internal_left = left + border;
-        float internal_right = right - border;
-        float internal_top = top - border;
-        float internal_bottom = bottom + border;
+        const float internal_left = left + border;
+        const float internal_right = right - border;
+        const float internal_top = top - border;
+        const float internal_bottom = bottom + border;
 
         // float left_uv = 0.0f;
-        float right_uv = 1.0f;
-        float top_uv = 1.0f;
-        float bottom_uv = 0.0f;
+        const float right_uv = 1.0f;
+        const float top_uv = 1.0f;
+        const float bottom_uv = 0.0f;
 
-        float internal_left_uv = (float)m_background_texture.metadata.left * inv_tex_width;
-        float internal_right_uv = 1.0f - (float)m_background_texture.metadata.right * inv_tex_width;
-        float internal_top_uv = 1.0f - (float)m_background_texture.metadata.top * inv_tex_height;
-        float internal_bottom_uv = (float)m_background_texture.metadata.bottom * inv_tex_height;
+        const float internal_left_uv = float(m_background_texture.metadata.left) * inv_tex_width;
+        const float internal_right_uv = 1.0f - float(m_background_texture.metadata.right) * inv_tex_width;
+        const float internal_top_uv = 1.0f - float(m_background_texture.metadata.top) * inv_tex_height;
+        const float internal_bottom_uv = float(m_background_texture.metadata.bottom) * inv_tex_height;
 
         // top-left corner
         GLTexture::render_sub_texture(tex_id, left, internal_left, internal_top, top, { { internal_left_uv, internal_bottom_uv }, { internal_right_uv, internal_bottom_uv }, { internal_right_uv, internal_top_uv }, { internal_left_uv, internal_top_uv } });
@@ -1007,8 +1006,7 @@ void GLGizmosManager::render_background(float left, float top, float right, floa
 }
 
 void GLGizmosManager::render_arrow(const GLCanvas3D& parent, EType highlighted_type) const
-{
-    
+{    
     std::vector<size_t> selectable_idxs = get_selectable_idxs();
     if (selectable_idxs.empty())
         return;