Skip to content

Commit 31e2a21

Browse files
committed
Merge branch 'Development' into node-groups
2 parents c88fa73 + 3d473cf commit 31e2a21

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

BlenderMalt/__init__.py

-3
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,6 @@ def register():
215215
def unregister():
216216
for _class in reversed(classes): bpy.utils.unregister_class(_class)
217217

218-
if version_missmatch():
219-
return
220-
221218
unregister_plugins()
222219

223220
for module in reversed(get_modules()):

Bridge/Server.py

+23
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,21 @@ def render(self):
273273

274274
PROFILE = False
275275

276+
@GLDEBUGPROC
277+
def gl_debug_callback(source, type, id, severity, length, message, user_param):
278+
def fmt(enum):
279+
try:
280+
return GL_ENUMS[enum].removeprefix("GL_DEBUG_").removesuffix("_KHR").removesuffix("_ARB").replace("_"," ")
281+
except:
282+
return "(format error)"
283+
msg = f"OPENGL DEBUG CALLBACK ({id}):\n{fmt(type)} > {fmt(severity)} > {fmt(source)}\n{message.decode('utf-8')}"
284+
if type == GL_DEBUG_TYPE_ERROR:
285+
LOG.error(msg)
286+
elif severity == GL_DEBUG_SEVERITY_NOTIFICATION:
287+
LOG.info(msg)
288+
else:
289+
LOG.warning(msg)
290+
276291
def main(pipeline_path, viewport_bit_depth, connection_addresses,
277292
shared_dic, lock, log_path, debug_mode, plugins_paths, docs_path):
278293
LOG.info('DEBUG MODE: {}'.format(debug_mode))
@@ -290,8 +305,16 @@ def main(pipeline_path, viewport_bit_depth, connection_addresses,
290305
glfw.window_hint(glfw.CONTEXT_VERSION_MINOR, 5)
291306
glfw.window_hint(glfw.OPENGL_PROFILE, glfw.OPENGL_CORE_PROFILE)
292307

308+
if debug_mode:
309+
glfw.window_hint(glfw.OPENGL_DEBUG_CONTEXT, True)
310+
293311
window = glfw.create_window(256, 256, 'Malt', None, None)
294312
glfw.make_context_current(window)
313+
314+
if debug_mode:
315+
glEnable(GL_DEBUG_OUTPUT)
316+
glDebugMessageCallback(gl_debug_callback, None)
317+
295318
# Don't hide for better OS/Drivers schedule priority
296319
#glfw.hide_window(window)
297320
# Minimize instead:

0 commit comments

Comments
 (0)