fixes for linux / intel gpu

ucpu · Jul 29, 2024 · 8c25480 · 8c25480
1 parent 9bf3553
commit 8c25480
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/sources/libengine/graphics/uniformBuffer.cpp b/sources/libengine/graphics/uniformBuffer.cpp
@@ -104,7 +104,7 @@ namespace cage
 		else
 		{
 			if (usage == 0)
-				usage = GL_STATIC_DRAW;
+                usage = GL_DYNAMIC_DRAW;
 			glNamedBufferData(impl->id, buffer.size(), buffer.data(), usage);
 			CAGE_CHECK_GL_ERROR_DEBUG();
 			impl->size = numeric_cast<uint32>(buffer.size());

diff --git a/sources/libengine/window/window.cpp b/sources/libengine/window/window.cpp
@@ -65,6 +65,9 @@ namespace cage
 			GLFWwindow *window = nullptr;
 			const int vsync = true;
 			bool focus = true;
+#ifdef CAGE_DEBUG
+            uint64 currentThreadIdGlBound = 0;
+#endif
 
 #ifdef GCHL_WINDOWS_THREAD
 			Holder<Thread> windowThread;
@@ -733,14 +736,32 @@ namespace cage
 		glfwSetWindowPos(impl->window, tmp[0], tmp[1]);
 	}
 
+#ifdef CAGE_DEBUG
+    namespace
+    {
+        Holder<Mutex> mutex = newMutex();
+    }
+#endif
+
 	void Window::makeCurrent()
 	{
-		WindowImpl *impl = (WindowImpl *)this;
+        WindowImpl *impl = (WindowImpl *)this;
+#ifdef CAGE_DEBUG
+        ScopeLock _(mutex);
+        CAGE_ASSERT(impl->currentThreadIdGlBound == 0);
+        impl->currentThreadIdGlBound = currentThreadId();
+#endif
 		glfwMakeContextCurrent(impl->window);
 	}
 
 	void Window::makeNotCurrent()
 	{
+#ifdef CAGE_DEBUG
+        WindowImpl *impl = (WindowImpl *)this;
+        ScopeLock _(mutex);
+        CAGE_ASSERT(impl->currentThreadIdGlBound == currentThreadId());
+        impl->currentThreadIdGlBound = 0;
+#endif
 		glfwMakeContextCurrent(nullptr);
 	}
 

diff --git a/sources/libsimple/gameloop.cpp b/sources/libsimple/gameloop.cpp
@@ -251,6 +251,7 @@ namespace cage
 			{
 				graphicsFinalize();
 				assets->unloadCustomThread(1);
+                window->makeNotCurrent();
 			}
 
 			//////////////////////////////////////