juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-01 15:22:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix OpenGL framebuffer object support on macOS (#14769)

Browse Source 
* Fix OpenGL framebuffer object support on macOS
this enables the outline on macOS

* Revert "Fix OpenGL framebuffer object support on macOS"

This reverts commit 9872708954.

* Enable ARB framebuffer if OpenGL >= 3.0 (OrcaSlicer/OrcaSlicer#14770)

* FIX: plater toolbar image update

jira: STUDIO-12457

Change-Id: Ia855b4bd9bec884d52202f5d8f5cfad9efce0f2f
(cherry picked from commit 474691813b497654ef701fe7073992db366e81a9)

* FIX: thumbinal regen

jira: STUDIO-16732

Change-Id: I4cc4e76b36caf1a41793c1f84ee5e88a44ebdd42
(cherry picked from commit 53f33b7db260005e477842d6459b1b28aa8aa0d8)

* FIX: force update thumbinal once dirty

jira: STUDIO-13041

Change-Id: I770743b53c51351cb3b8a7133140974c75c05364
(cherry picked from commit 96198a12712f21d2b4521b6e3d1caff50bed21ff)

* FIX：thumbnail update

jira: STUDIO-13041 / STUDIO-13304

Change-Id: I9dec25f12454fc8485195cf5dc3feb421b6347c4
(cherry picked from commit cf778dc90f805d3f46e28f8f1d1d5814d3fb4d51)

---------

Co-authored-by: jun.zhang <jun.zhang@bambulab.com>
This commit is contained in:
Noisyfox
2026-07-16 11:02:55 +08:00
committed by GitHub
parent 8d8e4c2835
commit 5e7ad1ad70
12 changed files with 76 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/shaders/110/imgui.fs
View File

@@ -1,11 +1,11 @@
#version 110
uniform sampler2D Texture;
uniform sampler2D s_texture;
varying vec2 Frag_UV;
varying vec4 Frag_Color;
void main()
{
gl_FragColor = Frag_Color * texture2D(Texture, Frag_UV.st);
gl_FragColor = Frag_Color * texture2D(s_texture, Frag_UV.st);
}

4
resources/shaders/140/imgui.fs
View File

@@ -1,6 +1,6 @@
#version 140
uniform sampler2D Texture;
uniform sampler2D s_texture;
in vec2 Frag_UV;
in vec4 Frag_Color;
@@ -9,5 +9,5 @@ out vec4 out_color;
void main()
{
out_color = Frag_Color * texture(Texture, Frag_UV.st);
out_color = Frag_Color * texture(s_texture, Frag_UV.st);
}