CRender: Fix shader_compile() error handling.

CrossVR · CrossVR · commit b1c35afcde72 · 2015-11-23T21:57:08.000+01:00
diff --git a/src/Layers/xrRenderPC_GL/rgl.cpp b/src/Layers/xrRenderPC_GL/rgl.cpp
@@ -923,7 +923,7 @@ HRESULT	CRender::shader_compile(
 		CHK_GL(glDetachShader(program, shader));
 		CHK_GL(glGetProgramiv(program, GL_LINK_STATUS, (GLint*)&status));
 
-		if (status == GL_TRUE)
+		if (status == GL_FALSE)
 		{
 			GLint length;
 			CHK_GL(glGetProgramiv(program, GL_INFO_LOG_LENGTH, &length));
@@ -944,7 +944,10 @@ HRESULT	CRender::shader_compile(
 		Log("! ", name);
 		if (_pErrorMsgs)
 			Log("! error: ", _pErrorMsgs);
+
+		return S_FALSE;
 	}
 
 	CHK_GL(glDeleteShader(shader));
+	return S_OK;
 }

Original file line number	Diff line number	Diff line change
`@@ -923,7 +923,7 @@ HRESULT CRender::shader_compile(`
`923`	`923`	`CHK_GL(glDetachShader(program, shader));`
`924`	`924`	`CHK_GL(glGetProgramiv(program, GL_LINK_STATUS, (GLint*)&status));`
`925`	`925`
`926`		`- if (status == GL_TRUE)`
	`926`	`+ if (status == GL_FALSE)`
`927`	`927`	`{`
`928`	`928`	`GLint length;`
`929`	`929`	`CHK_GL(glGetProgramiv(program, GL_INFO_LOG_LENGTH, &length));`
`@@ -944,7 +944,10 @@ HRESULT CRender::shader_compile(`
`944`	`944`	`Log("! ", name);`
`945`	`945`	`if (_pErrorMsgs)`
`946`	`946`	`Log("! error: ", _pErrorMsgs);`
	`947`	`+`
	`948`	`+ return S_FALSE;`
`947`	`949`	`}`
`948`	`950`
`949`	`951`	`CHK_GL(glDeleteShader(shader));`
	`952`	`+ return S_OK;`
`950`	`953`	`}`