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

FIX:fix crash opengl api in mac 

jira: none
Change-Id: I797082987378f53480eacdc6a2528cfdedf50528
(cherry picked from commit 654db45bc293c03ec72cbbb7f4a651a7e946f9ea)
This commit is contained in:
zhou.xu 2024-08-05 10:05:40 +08:00 committed by Lane.Wei
parent bb53c4b517
commit c03aa5ffeb
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/slic3r/GUI/GLModel.cpp
View File

@ -916,23 +916,26 @@ void GLModel::create_or_update_mats_vbo(unsigned int &vbo, const std::vector<Sli
void GLModel::bind_mats_vbo(unsigned int instance_mats_vbo, unsigned int instances_count, int location)
{
if (instance_mats_vbo == 0 || instances_count == 0) {
return;
}
auto one_mat_all_size = sizeof(float) * 16;
auto one_mat_col_size = sizeof(float) * 4;
glsafe(::glBindBuffer(GL_ARRAY_BUFFER, instance_mats_vbo));
for (unsigned int i = 0; i < instances_count; i++) { // set attribute pointers for matrix (4 times vec4)
glEnableVertexAttribArray(location);
glVertexAttribPointer(location, 4, GL_FLOAT, GL_FALSE, one_mat_all_size, (void *) 0);
glEnableVertexAttribArray(location + 1);
glVertexAttribPointer(location + 1, 4, GL_FLOAT, GL_FALSE, one_mat_all_size, (void *) (one_mat_col_size));
glEnableVertexAttribArray(location + 2);
glVertexAttribPointer(location + 2, 4, GL_FLOAT, GL_FALSE, one_mat_all_size, (void *) (2 * one_mat_col_size));
glEnableVertexAttribArray(location + 3);
glVertexAttribPointer(location + 3, 4, GL_FLOAT, GL_FALSE, one_mat_all_size, (void *) (3 * one_mat_col_size));
glsafe(glEnableVertexAttribArray(location));
glsafe(glVertexAttribPointer(location, 4, GL_FLOAT, GL_FALSE, one_mat_all_size, (void *) 0));
glsafe(glEnableVertexAttribArray(location + 1));
glsafe(glVertexAttribPointer(location + 1, 4, GL_FLOAT, GL_FALSE, one_mat_all_size, (void *) (one_mat_col_size)));
glsafe(glEnableVertexAttribArray(location + 2));
glsafe(glVertexAttribPointer(location + 2, 4, GL_FLOAT, GL_FALSE, one_mat_all_size, (void *) (2 * one_mat_col_size)));
glsafe(glEnableVertexAttribArray(location + 3));
glsafe(glVertexAttribPointer(location + 3, 4, GL_FLOAT, GL_FALSE, one_mat_all_size, (void *) (3 * one_mat_col_size)));
// Update the matrix every time after an object is drawn//useful
glVertexAttribDivisor(location, 1);
glVertexAttribDivisor(location + 1, 1);
glVertexAttribDivisor(location + 2, 1);
glVertexAttribDivisor(location + 3, 1);
glsafe(glVertexAttribDivisor(location, 1));
glsafe(glVertexAttribDivisor(location + 1, 1));
glsafe(glVertexAttribDivisor(location + 2, 1));
glsafe(glVertexAttribDivisor(location + 3, 1));
}
}
@ -943,6 +946,9 @@ void GLModel::render_geometry_instance(unsigned int instance_mats_vbo, unsigned
void GLModel::render_geometry_instance(unsigned int instance_mats_vbo, unsigned int instances_count, const std::pair<size_t, size_t> &range)
{
if (instance_mats_vbo == 0 || instances_count == 0) {
return;
}
if (m_render_data.size() != 1) { return; }
GLShaderProgram *shader = wxGetApp().get_current_shader();
if (shader == nullptr) return;

1
src/slic3r/GUI/OpenGLManager.cpp
View File

@ -236,6 +236,7 @@ OpenGLManager::~OpenGLManager()
bool OpenGLManager::init_gl(bool popup_error)
{
if (!m_gl_initialized) {
glewExperimental = GL_TRUE;
GLenum result = glewInit();
if (result != GLEW_OK) {
BOOST_LOG_TRIVIAL(error) << "Unable to init glew library";

1
src/slic3r/GUI/PartPlate.cpp
View File

@ -4766,6 +4766,7 @@ void PartPlateList::render_instance_grid(bool bottom)
void PartPlateList::render_instance_background(bool force_default_color)
{
if (m_unselected_plate_trans.size() == 0) { return; }
// draw background
ColorRGBA color;
if (!force_default_color) {