mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: disable msaa for picking pass 

jira: no-jira

Change-Id: Idc6914af11d46b9fe626e52104223411a6ec1a96
This commit is contained in:
jun.zhang 2025-03-21 09:49:15 +08:00 committed by lane.wei
parent facf6a0248
commit 75241aae61
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -6310,22 +6310,28 @@ void GLCanvas3D::render_thumbnail_framebuffer(const std::shared_ptr<OpenGLManage
const auto fb_type = Slic3r::GUI::OpenGLManager::get_framebuffers_type(); const auto fb_type = Slic3r::GUI::OpenGLManager::get_framebuffers_type();
BOOST_LOG_TRIVIAL(info) << boost::format("framebuffer_type: %1%") % Slic3r::GUI::OpenGLManager::framebuffer_type_to_string(fb_type).c_str(); BOOST_LOG_TRIVIAL(info) << boost::format("framebuffer_type: %1%") % Slic3r::GUI::OpenGLManager::framebuffer_type_to_string(fb_type).c_str();
EMSAAType msaa_type = EMSAAType::Disabled; EMSAAType msaa_type = EMSAAType::Disabled;
const bool b_need_msaa = !for_picking;
uint32_t samples = 0;
if (fb_type != OpenGLManager::EFramebufferType::Unknown) { if (fb_type != OpenGLManager::EFramebufferType::Unknown) {
thumbnail_fb_name = "thumbnail_fb"; thumbnail_fb_name = "thumbnail_fb";
if (b_need_msaa) {
GLint max_samples; GLint max_samples;
glsafe(::glGetIntegerv(GL_MAX_SAMPLES, &max_samples)); glsafe(::glGetIntegerv(GL_MAX_SAMPLES, &max_samples));
if (max_samples >= 4) { if (max_samples >= 4) {
msaa_type = EMSAAType::X4; msaa_type = EMSAAType::X4;
samples = 4;
BOOST_LOG_TRIVIAL(info) << boost::format("framebuffer msaa type: %1%") % "X4"; BOOST_LOG_TRIVIAL(info) << boost::format("framebuffer msaa type: %1%") % "X4";
} }
else if (max_samples == 2){ else if (max_samples == 2) {
msaa_type = EMSAAType::X2; msaa_type = EMSAAType::X2;
samples = 2;
BOOST_LOG_TRIVIAL(info) << boost::format("framebuffer msaa type: %1%") % "X2"; BOOST_LOG_TRIVIAL(info) << boost::format("framebuffer msaa type: %1%") % "X2";
} }
else { else {
BOOST_LOG_TRIVIAL(info) << boost::format("framebuffer msaa type: %1%") % "Disabled"; BOOST_LOG_TRIVIAL(info) << boost::format("framebuffer msaa type: %1%") % "Disabled";
} }
} }
}
else if (p_ogl_manager->is_legacy_framebuffer_enabled()) { else if (p_ogl_manager->is_legacy_framebuffer_enabled()) {
thumbnail_fb_name = OpenGLManager::s_back_frame; thumbnail_fb_name = OpenGLManager::s_back_frame;
} }
@ -6358,7 +6364,8 @@ void GLCanvas3D::render_thumbnail_framebuffer(const std::shared_ptr<OpenGLManage
if (p_fb) { if (p_fb) {
fb_id = p_fb->get_gl_id(); fb_id = p_fb->get_gl_id();
} }
BOOST_LOG_TRIVIAL(info) << boost::format("render_thumbnail prepare: w %1%, h %2%, render_fbo %3%") % w % h % fb_id;
BOOST_LOG_TRIVIAL(info) << boost::format("render_thumbnail prepare: w %1%, h %2%, samples %3%, render_fbo %4%") % w % h % samples % fb_id;
#if ENABLE_THUMBNAIL_GENERATOR_DEBUG_OUTPUT #if ENABLE_THUMBNAIL_GENERATOR_DEBUG_OUTPUT
debug_output_thumbnail(thumbnail_data); debug_output_thumbnail(thumbnail_data);