diff --git a/resources/shaders/140/printbed.fs b/resources/shaders/140/printbed.fs index 86edd0daf4..6d927a749c 100644 --- a/resources/shaders/140/printbed.fs +++ b/resources/shaders/140/printbed.fs @@ -3,16 +3,17 @@ const vec3 back_color_dark = vec3(0.235, 0.235, 0.235); const vec3 back_color_light = vec3(0.365, 0.365, 0.365); -uniform sampler2D texture; +uniform sampler2D in_texture; uniform bool transparent_background; uniform bool svg_source; in vec2 tex_coord; +out vec4 frag_color; vec4 svg_color() { // takes foreground from texture - vec4 fore_color = texture(texture, tex_coord); + vec4 fore_color = texture(in_texture, tex_coord); // calculates radial gradient vec3 back_color = vec3(mix(back_color_light, back_color_dark, smoothstep(0.0, 0.5, length(abs(tex_coord.xy) - vec2(0.5))))); @@ -24,11 +25,11 @@ vec4 svg_color() vec4 non_svg_color() { // takes foreground from texture - vec4 color = texture(texture, tex_coord); + vec4 color = texture(in_texture, tex_coord); return vec4(color.rgb, transparent_background ? color.a * 0.25 : color.a); } void main() { - gl_FragColor = svg_source ? svg_color() : non_svg_color(); + frag_color = svg_source ? svg_color() : non_svg_color(); } \ No newline at end of file diff --git a/src/slic3r/GUI/GLShadersManager.cpp b/src/slic3r/GUI/GLShadersManager.cpp index a01c39864a..ab8dfb3e77 100644 --- a/src/slic3r/GUI/GLShadersManager.cpp +++ b/src/slic3r/GUI/GLShadersManager.cpp @@ -35,7 +35,7 @@ std::pair GLShadersManager::init() #if ENABLE_LEGACY_OPENGL_REMOVAL #if ENABLE_GL_SHADERS_ATTRIBUTES - const std::string prefix = !GUI::wxGetApp().is_gl_version_greater_or_equal_to(3, 1) ? "140/" : "110/"; + const std::string prefix = GUI::wxGetApp().is_gl_version_greater_or_equal_to(3, 1) ? "140/" : "110/"; // imgui shader valid &= append_shader("imgui", { prefix + "imgui.vs", prefix + "imgui.fs" }); // basic shader, used to render all what was previously rendered using the immediate mode