GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 14:45:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libvgcode - small optimization

Browse Source
This commit is contained in:
enricoturri1966 2024-03-07 13:21:42 +01:00 committed by Lukas Matena
parent c7f61a795f
commit c0ef0e52a1
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvgcode/src/OpenGLUtils.cpp
View File

@ -87,7 +87,7 @@ bool OpenGLWrapper::load_opengl(const std::string& context_version)
return s_valid_context; return s_valid_context;
} }
void OpenGLWrapper::unload_opengl() void OpenGLWrapper::unload_opengl()
{ {
#if VGCODE_ENABLE_OPENGL_ES #if VGCODE_ENABLE_OPENGL_ES
gladLoaderUnloadGLES2(); gladLoaderUnloadGLES2();

32
src/libvgcode/src/ViewerImpl.cpp
View File

@ -680,6 +680,24 @@ std::pair<unsigned int, size_t> ViewerImpl::TextureData::get_enabled_options_tex
return m_tex_ids[id].enabled_options; return m_tex_ids[id].enabled_options;
} }
size_t ViewerImpl::TextureData::get_enabled_segments_count() const
{
size_t ret = 0;
for (size_t i = 0; i < m_count; ++i) {
ret += m_tex_ids[i].enabled_segments.second;
}
return ret;
}
size_t ViewerImpl::TextureData::get_enabled_options_count() const
{
size_t ret = 0;
for (size_t i = 0; i < m_count; ++i) {
ret += m_tex_ids[i].enabled_options.second;
}
return ret;
}
size_t ViewerImpl::TextureData::get_used_gpu_memory() const size_t ViewerImpl::TextureData::get_used_gpu_memory() const
{ {
size_t ret = 0; size_t ret = 0;
@ -1795,6 +1813,13 @@ void ViewerImpl::render_segments(const Mat4x4& view_matrix, const Mat4x4& projec
if (m_segments_shader_id == 0) if (m_segments_shader_id == 0)
return; return;
#if VGCODE_ENABLE_OPENGL_ES
if (m_texture_data.get_enabled_segments_count() == 0)
#else
if (m_enabled_segments_count == 0)
#endif // VGCODE_ENABLE_OPENGL_ES
return;
int curr_active_texture = 0; int curr_active_texture = 0;
glsafe(glGetIntegerv(GL_ACTIVE_TEXTURE, &curr_active_texture)); glsafe(glGetIntegerv(GL_ACTIVE_TEXTURE, &curr_active_texture));
int curr_shader; int curr_shader;
@ -1869,6 +1894,13 @@ void ViewerImpl::render_options(const Mat4x4& view_matrix, const Mat4x4& project
if (m_options_shader_id == 0) if (m_options_shader_id == 0)
return; return;
#if VGCODE_ENABLE_OPENGL_ES
if (m_texture_data.get_enabled_options_count() == 0)
#else
if (m_enabled_options_count == 0)
#endif // VGCODE_ENABLE_OPENGL_ES
return;
int curr_active_texture = 0; int curr_active_texture = 0;
glsafe(glGetIntegerv(GL_ACTIVE_TEXTURE, &curr_active_texture)); glsafe(glGetIntegerv(GL_ACTIVE_TEXTURE, &curr_active_texture));
int curr_shader; int curr_shader;

3
src/libvgcode/src/ViewerImpl.hpp
View File

@ -350,6 +350,9 @@ private:
std::pair<unsigned int, size_t> get_enabled_segments_tex_id(size_t id) const; std::pair<unsigned int, size_t> get_enabled_segments_tex_id(size_t id) const;
std::pair<unsigned int, size_t> get_enabled_options_tex_id(size_t id) const; std::pair<unsigned int, size_t> get_enabled_options_tex_id(size_t id) const;
size_t get_enabled_segments_count() const;
size_t get_enabled_options_count() const;
size_t max_texture_capacity() const { return m_width * m_height; } size_t max_texture_capacity() const { return m_width * m_height; }
size_t get_used_gpu_memory() const; size_t get_used_gpu_memory() const;