Merge pull request #1188 from asarium/fix/objectLabelCrash

The-E · web-flow · commit 6efceb201739 · 2017-02-05T17:19:37.000+01:00
Fix crash when using glObjectLabel
diff --git a/code/graphics/opengl/gropengl.cpp b/code/graphics/opengl/gropengl.cpp
@@ -1658,7 +1658,7 @@ void gr_opengl_pop_debug_group() {
 }
 void opengl_set_object_label(GLenum type, GLuint handle, const SCP_string& name) {
 	if (GLAD_GL_KHR_debug) {
-		glObjectLabelKHR(type, handle, (GLsizei) name.size(), name.c_str());
+		glObjectLabel(type, handle, (GLsizei) name.size(), name.c_str());
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1658,7 +1658,7 @@ void gr_opengl_pop_debug_group() {`
`1658`	`1658`	`}`
`1659`	`1659`	`void opengl_set_object_label(GLenum type, GLuint handle, const SCP_string& name) {`
`1660`	`1660`	`if (GLAD_GL_KHR_debug) {`
`1661`		`- glObjectLabelKHR(type, handle, (GLsizei) name.size(), name.c_str());`
	`1661`	`+ glObjectLabel(type, handle, (GLsizei) name.size(), name.c_str());`
`1662`	`1662`	`}`
`1663`	`1663`	`}`
`1664`	`1664`