From 9e2cb967a5ce36fba2a457f4f665782257915257 Mon Sep 17 00:00:00 2001 From: heinezen Date: Tue, 3 Oct 2023 20:58:35 +0200 Subject: [PATCH 1/2] engine: Remove warning for jthread on clang. --- libopenage/engine/engine.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libopenage/engine/engine.h b/libopenage/engine/engine.h index cd4d848c14..da56e4ead0 100644 --- a/libopenage/engine/engine.h +++ b/libopenage/engine/engine.h @@ -25,8 +25,6 @@ class jthread : public thread { } }; } // namespace std -#else -#error "jthread is supported now, remove custom definition" #endif #else #include From 3e408ea9be98a2014a0cf6e014671f629e52f261 Mon Sep 17 00:00:00 2001 From: heinezen Date: Tue, 3 Oct 2023 20:59:19 +0200 Subject: [PATCH 2/2] renderer: Fix GLUniform substitution error for clang. --- libopenage/renderer/opengl/shader_program.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libopenage/renderer/opengl/shader_program.cpp b/libopenage/renderer/opengl/shader_program.cpp index f5a2315072..67127ecc1f 100644 --- a/libopenage/renderer/opengl/shader_program.cpp +++ b/libopenage/renderer/opengl/shader_program.cpp @@ -204,7 +204,7 @@ GlShaderProgram::GlShaderProgram(const std::shared_ptr &context, GLuint loc = glGetUniformLocation(handle, name.data()); - this->uniforms.emplace_back(type, loc); + this->uniforms.push_back({type, loc}); this->uniforms_by_name.insert(std::make_pair( name.data(),