Merge pull request #30 from Unity-Technologies/fix-opengl-crash-on-start

matas-tunkevicius · web-flow · commit 58c639adea06 · 2023-04-17T15:30:26.000+03:00
Windows - Fix crash on startup, caused by glGetError
diff --git a/PluginSource/source/RenderAPI_OpenGLCoreES.cpp b/PluginSource/source/RenderAPI_OpenGLCoreES.cpp
@@ -137,6 +137,10 @@ static GLuint CreateShader(GLenum type, const char* sourceText)
 
 void RenderAPI_OpenGLCoreES::CreateResources()
 {
+#	if UNITY_WIN && SUPPORT_OPENGL_CORE
+	if (m_APIType == kUnityGfxRendererOpenGLCore)
+		gl3wInit();
+#	endif
 	// Make sure that there are no GL error flags set before creating resources
 	while (glGetError() != GL_NO_ERROR) {}
 
@@ -154,10 +158,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,10 @@ 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`	`+ if (m_APIType == kUnityGfxRendererOpenGLCore)`
	`142`	`+ gl3wInit();`
	`143`	`+# endif`
`140`	`144`	`// Make sure that there are no GL error flags set before creating resources`
`141`	`145`	`while (glGetError() != GL_NO_ERROR) {}`
`142`	`146`
`@@ -154,10 +158,6 @@ void RenderAPI_OpenGLCoreES::CreateResources()`
`154`	`158`	`# if SUPPORT_OPENGL_CORE`
`155`	`159`	`else if (m_APIType == kUnityGfxRendererOpenGLCore)`
`156`	`160`	`{`
`157`		`-# if UNITY_WIN`
`158`		`- gl3wInit();`
`159`		`-# endif`
`160`		`-`
`161`	`161`	`m_VertexShader = CreateShader(GL_VERTEX_SHADER, kGlesVProgTextGLCore);`
`162`	`162`	`m_FragmentShader = CreateShader(GL_FRAGMENT_SHADER, kGlesFShaderTextGLCore);`
`163`	`163`	`}`