Fixed wrong GL context being active in various cases

Mesh creation (CreateBuffers), mesh destructor, shader/texture creation.
ousnius · Apr 24, 2020 · 011cc3f · 011cc3f
1 parent bef23b3
commit 011cc3f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/src/program/OutfitStudio.cpp b/src/program/OutfitStudio.cpp
@@ -8899,8 +8899,10 @@ void wxGLPanel::AddMeshFromNif(NifFile* nif, const std::string& shapeName) {
 		m->BuildEdgeList();
 		m->ColorFill(Vector3());
 
-		if (extInitialized)
+		if (extInitialized) {
+			gls.SetContext();
 			m->CreateBuffers();
+		}
 	}
 }
 

diff --git a/src/render/GLSurface.cpp b/src/render/GLSurface.cpp
@@ -670,6 +670,7 @@ void GLSurface::HideSegCursor() {
 }
 
 void GLSurface::SetSize(uint w, uint h) {
+	SetContext();
 	glViewport(0, 0, w, h);
 	vpW = w;
 	vpH = h;
@@ -765,6 +766,11 @@ void GLSurface::RenderToTexture(GLMaterial* renderShader) {
 
 }
 
+void GLSurface::SetContext() {
+	if (canvas && context)
+		canvas->SetCurrent(*context);
+}
+
 void GLSurface::RenderOneFrame() {
 	if (!canvas)
 		return;
@@ -1247,6 +1253,8 @@ void GLSurface::SetSkinModelMat(mesh *m, const MatTransform &xformGlobalToSkin)
 }
 
 mesh* GLSurface::AddVisPoint(const Vector3& p, const std::string& name, const Vector3* color) {
+	SetContext();
+
 	mesh* m = GetOverlay(name);
 	if (m) {
 		m->verts[0] = p;
@@ -1280,6 +1288,8 @@ mesh* GLSurface::AddVisPoint(const Vector3& p, const std::string& name, const Ve
 }
 
 int GLSurface::AddVisCircle(const Vector3& center, const Vector3& normal, float radius, const std::string& name) {
+	SetContext();
+
 	Matrix4 rotMat;
 	int ringMesh = GetOverlayID(name);
 	if (ringMesh >= 0)
@@ -1330,6 +1340,8 @@ int GLSurface::AddVisCircle(const Vector3& center, const Vector3& normal, float
 }
 
 mesh* GLSurface::AddVis3dRing(const Vector3& center, const Vector3& normal, float holeRadius, float ringRadius, const Vector3& color, const std::string& name) {
+	SetContext();
+
 	const int nRingSegments = 36;
 	const int nRingSteps = 4;
 
@@ -1427,6 +1439,8 @@ mesh* GLSurface::AddVis3dRing(const Vector3& center, const Vector3& normal, floa
 
 
 mesh* GLSurface::AddVis3dArrow(const Vector3& origin, const Vector3& direction, float stemRadius, float pointRadius, float length, const Vector3& color, const std::string& name) {
+	SetContext();
+
 	const int nRingVerts = 36;
 	Matrix4 rotMat;
 
@@ -1523,6 +1537,8 @@ mesh* GLSurface::AddVis3dArrow(const Vector3& origin, const Vector3& direction,
 }
 
 mesh* GLSurface::AddVis3dCube(const Vector3& center, const Vector3& normal, float radius, const Vector3& color, const std::string& name) {
+	SetContext();
+
 	const int nCubeVerts = 8;
 	const int nCubeTris = 12;
 	mesh* m = nullptr;
@@ -1582,6 +1598,8 @@ mesh* GLSurface::AddVis3dCube(const Vector3& center, const Vector3& normal, floa
 }
 
 mesh* GLSurface::AddVisPlane(const Vector3& center, const Vector2& size, float uvScale, float uvOffset, const std::string& name, const Vector3* color) {
+	SetContext();
+
 	mesh* m = nullptr;
 
 	int meshID = GetOverlayID(name);
@@ -1631,6 +1649,8 @@ mesh* GLSurface::AddVisPlane(const Vector3& center, const Vector2& size, float u
 }
 
 mesh* GLSurface::AddVisSeg(const Vector3& p1, const Vector3& p2, const std::string& name) {
+	SetContext();
+
 	mesh* m = GetOverlay(name);
 	if (m) {
 		m->verts[0] = p1;
@@ -1796,6 +1816,8 @@ RenderMode GLSurface::SetMeshRenderMode(const std::string& name, RenderMode mode
 }
 
 GLMaterial* GLSurface::AddMaterial(const std::vector<std::string>& textureFiles, const std::string& vShaderFile, const std::string& fShaderFile, const bool reloadTextures) {
+	SetContext();
+
 	GLMaterial* mat = resLoader.AddMaterial(textureFiles, vShaderFile, fShaderFile, reloadTextures);
 	if (mat) {
 		std::string shaderError;
@@ -1810,6 +1832,7 @@ GLMaterial* GLSurface::AddMaterial(const std::vector<std::string>& textureFiles,
 
 GLMaterial* GLSurface::GetPrimitiveMaterial() {
 	if (!primitiveMat) {
+		SetContext();
 		primitiveMat = new GLMaterial(Config["AppDir"] + "/res/shaders/primitive.vert", Config["AppDir"] + "/res/shaders/primitive.frag");
 
 		std::string shaderError;

diff --git a/src/render/GLSurface.h b/src/render/GLSurface.h
@@ -79,6 +79,8 @@ class GLSurface {
 
 	void DeleteMesh(int meshID) {
 		if (meshID < meshes.size()) {
+			SetContext();
+
 			activeMeshes.erase(std::remove(activeMeshes.begin(), activeMeshes.end(), meshes[meshID]), activeMeshes.end());
 			activeMeshesID.erase(std::remove(activeMeshesID.begin(), activeMeshesID.end(), meshID), activeMeshesID.end());
 
@@ -93,6 +95,8 @@ class GLSurface {
 
 	void DeleteOverlay(int meshID) {
 		if (meshID < overlays.size()) {
+			SetContext();
+
 			delete overlays[meshID];
 			overlays.erase(overlays.begin() + meshID);
 
@@ -124,6 +128,8 @@ class GLSurface {
 	}
 
 	void DeleteAllMeshes() {
+		SetContext();
+
 		for (auto &m : meshes)
 			delete m;
 
@@ -142,6 +148,8 @@ class GLSurface {
 	}
 
 	void DeleteOverlays() {
+		SetContext();
+
 		for (int i = 0; i < overlays.size(); i++)
 			delete overlays[i];
 
@@ -340,6 +348,7 @@ class GLSurface {
 		return &resLoader;
 	}
 
+	void SetContext();
 	void RenderOneFrame();
 	void RenderToTexture(GLMaterial* renderShader);
 	void RenderMesh(mesh* m);