[opengl][windows] fix crash on startup, caused by using OpenGL API before it is initialized

eduardas.vitkus · eduardas.vitkus · commit 85840b6ccb1c · 2023-03-30T13:29:38.000+03:00
diff --git a/PluginSource/source/RenderAPI_OpenGLCoreES.cpp b/PluginSource/source/RenderAPI_OpenGLCoreES.cpp
@@ -137,6 +137,9 @@ static GLuint CreateShader(GLenum type, const char* sourceText)
 
 void RenderAPI_OpenGLCoreES::CreateResources()
 {
+#	if UNITY_WIN && SUPPORT_OPENGL_CORE
+	gl3wInit();
+#	endif
 	// Make sure that there are no GL error flags set before creating resources
 	while (glGetError() != GL_NO_ERROR) {}
 
@@ -154,10 +157,6 @@ void RenderAPI_OpenGLCoreES::CreateResources()
 #	if SUPPORT_OPENGL_CORE
 	else if (m_APIType == kUnityGfxRendererOpenGLCore)
 	{
-#		if UNITY_WIN
-		gl3wInit();
-#		endif
-
 		m_VertexShader = CreateShader(GL_VERTEX_SHADER, kGlesVProgTextGLCore);
 		m_FragmentShader = CreateShader(GL_FRAGMENT_SHADER, kGlesFShaderTextGLCore);
 	}

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,9 @@ static GLuint CreateShader(GLenum type, const char* sourceText)`
`137`	`137`
`138`	`138`	`void RenderAPI_OpenGLCoreES::CreateResources()`
`139`	`139`	`{`
	`140`	`+# if UNITY_WIN && SUPPORT_OPENGL_CORE`
	`141`	`+ gl3wInit();`
	`142`	`+# endif`
`140`	`143`	`// Make sure that there are no GL error flags set before creating resources`
`141`	`144`	`while (glGetError() != GL_NO_ERROR) {}`
`142`	`145`
`@@ -154,10 +157,6 @@ void RenderAPI_OpenGLCoreES::CreateResources()`
`154`	`157`	`# if SUPPORT_OPENGL_CORE`
`155`	`158`	`else if (m_APIType == kUnityGfxRendererOpenGLCore)`
`156`	`159`	`{`
`157`		`-# if UNITY_WIN`
`158`		`- gl3wInit();`
`159`		`-# endif`
`160`		`-`
`161`	`160`	`m_VertexShader = CreateShader(GL_VERTEX_SHADER, kGlesVProgTextGLCore);`
`162`	`161`	`m_FragmentShader = CreateShader(GL_FRAGMENT_SHADER, kGlesFShaderTextGLCore);`
`163`	`162`	`}`