Equalize with the develop

beyond-all-reason · Feb 22, 2021 · 6571318 · 6571318
1 parent efcfd57
commit 6571318
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/rts/Lua/LuaOpenGL.cpp b/rts/Lua/LuaOpenGL.cpp
@@ -2442,10 +2442,15 @@ int LuaOpenGL::DispatchCompute(lua_State* L)
 	const GLuint numGroupY = (GLuint)luaL_checknumber(L, 2);
 	const GLuint numGroupZ = (GLuint)luaL_checknumber(L, 3);
 
-	GLint maxNumGroups[3];
-	glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 0, &maxNumGroups[0]);
-	glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 1, &maxNumGroups[1]);
-	glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 2, &maxNumGroups[2]);
+	const auto maxCompWGFunc = []() {
+		std::array<GLint, 3> maxNumGroups;
+		glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 0, &maxNumGroups[0]);
+		glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 1, &maxNumGroups[1]);
+		glGetIntegeri_v(GL_MAX_COMPUTE_WORK_GROUP_COUNT, 2, &maxNumGroups[2]);
+		return maxNumGroups;
+	};
+
+	static std::array<GLint, 3> maxNumGroups = maxCompWGFunc();
 
 	if (numGroupX < 0 && numGroupX > maxNumGroups[0] ||
 		numGroupY < 0 && numGroupY > maxNumGroups[1] ||

diff --git a/rts/Rendering/Textures/TextureAtlas.cpp b/rts/Rendering/Textures/TextureAtlas.cpp
@@ -188,6 +188,7 @@ bool CTextureAtlas::CreateTexture()
 
 	pbo.Invalidate();
 	pbo.Unbind();
+	pbo.Release();
 
 	return (data != nullptr);
 }