gl_rendertarget: Always set all draw buffers.

CrossVR · CrossVR · commit 2407c94762ea · 2016-03-24T23:52:42.000+01:00
diff --git a/src/Layers/xrRenderPC_GL/gl_rendertarget.cpp b/src/Layers/xrRenderPC_GL/gl_rendertarget.cpp
@@ -19,80 +19,77 @@ void	CRenderTarget::u_setrt(const ref_rt& _1, const ref_rt& _2, const ref_rt& _3
 	VERIFY(_1);
 	dwWidth = _1->dwWidth;
 	dwHeight = _1->dwHeight;
-	GLuint cnt = 0;
 	GLenum buffers[3] = { GL_NONE };
 	if (_1)
 	{
-		buffers[cnt++] = GL_COLOR_ATTACHMENT0;
+		buffers[0] = GL_COLOR_ATTACHMENT0;
 		RCache.set_RT(_1->pRT, 0);
 	}
 	if (_2)
 	{
-		buffers[cnt++] = GL_COLOR_ATTACHMENT1;
+		buffers[1] = GL_COLOR_ATTACHMENT1;
 		RCache.set_RT(_2->pRT, 1);
 	}
 	if (_3)
 	{
-		buffers[cnt++] = GL_COLOR_ATTACHMENT2;
+		buffers[2] = GL_COLOR_ATTACHMENT2;
 		RCache.set_RT(_3->pRT, 2);
 	}
 	RCache.set_ZB(zb);
 	//	RImplementation.rmNormal				();
 	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
 	VERIFY(status == GL_FRAMEBUFFER_COMPLETE);
-	CHK_GL(glDrawBuffers(cnt, buffers));
+	CHK_GL(glDrawBuffers(3, buffers));
 }
 
 void	CRenderTarget::u_setrt(const ref_rt& _1, const ref_rt& _2, GLuint zb)
 {
 	VERIFY(_1);
 	dwWidth = _1->dwWidth;
 	dwHeight = _1->dwHeight;
-	GLuint cnt = 0;
 	GLenum buffers[2] = { GL_NONE };
 	if (_1)
 	{
-		buffers[cnt++] = GL_COLOR_ATTACHMENT0;
+		buffers[0] = GL_COLOR_ATTACHMENT0;
 		RCache.set_RT(_1->pRT, 0);
 	}
 	if (_2)
 	{
-		buffers[cnt++] = GL_COLOR_ATTACHMENT1;
+		buffers[1] = GL_COLOR_ATTACHMENT1;
 		RCache.set_RT(_2->pRT, 1);
 	}
 	RCache.set_ZB(zb);
 	//	RImplementation.rmNormal				();
 	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
 	VERIFY(status == GL_FRAMEBUFFER_COMPLETE);
-	CHK_GL(glDrawBuffers(cnt, buffers));
+	CHK_GL(glDrawBuffers(2, buffers));
 }
 
 void	CRenderTarget::u_setrt(u32 W, u32 H, GLuint _1, GLuint _2, GLuint _3, GLuint zb)
 {
 	dwWidth = W;
 	dwHeight = H;
-	GLuint cnt = 0;
 	GLenum buffers[3] = { GL_NONE };
 	if (_1)
 	{
-		buffers[cnt++] = GL_COLOR_ATTACHMENT0;
+		buffers[0] = GL_COLOR_ATTACHMENT0;
 		RCache.set_RT(_1, 0);
 	}
 	if (_2)
 	{
-		buffers[cnt++] = GL_COLOR_ATTACHMENT1;
+		buffers[1] = GL_COLOR_ATTACHMENT1;
 		RCache.set_RT(_2, 1);
 	}
 	if (_3)
 	{
-		buffers[cnt++] = GL_COLOR_ATTACHMENT2;
+		buffers[2] = GL_COLOR_ATTACHMENT2;
 		RCache.set_RT(_3, 2);
 	}
 	RCache.set_ZB(zb);
 	//	RImplementation.rmNormal				();
 	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
 	VERIFY(status == GL_FRAMEBUFFER_COMPLETE);
-	CHK_GL(glDrawBuffers(cnt, buffers));
+	CHK_GL(glDrawBuffers(3, buffers));
 }
 
 void	CRenderTarget::u_stencil_optimize	(eStencilOptimizeMode eSOM)

Original file line number	Diff line number	Diff line change
`@@ -19,80 +19,77 @@ void CRenderTarget::u_setrt(const ref_rt& _1, const ref_rt& _2, const ref_rt& _3`
`19`	`19`	`VERIFY(_1);`
`20`	`20`	`dwWidth = _1->dwWidth;`
`21`	`21`	`dwHeight = _1->dwHeight;`
`22`		`- GLuint cnt = 0;`
`23`	`22`	`GLenum buffers[3] = { GL_NONE };`
`24`	`23`	`if (_1)`
`25`	`24`	`{`
`26`		`- buffers[cnt++] = GL_COLOR_ATTACHMENT0;`
	`25`	`+ buffers[0] = GL_COLOR_ATTACHMENT0;`
`27`	`26`	`RCache.set_RT(_1->pRT, 0);`
`28`	`27`	`}`
`29`	`28`	`if (_2)`
`30`	`29`	`{`
`31`		`- buffers[cnt++] = GL_COLOR_ATTACHMENT1;`
	`30`	`+ buffers[1] = GL_COLOR_ATTACHMENT1;`
`32`	`31`	`RCache.set_RT(_2->pRT, 1);`
`33`	`32`	`}`
`34`	`33`	`if (_3)`
`35`	`34`	`{`
`36`		`- buffers[cnt++] = GL_COLOR_ATTACHMENT2;`
	`35`	`+ buffers[2] = GL_COLOR_ATTACHMENT2;`
`37`	`36`	`RCache.set_RT(_3->pRT, 2);`
`38`	`37`	`}`
`39`	`38`	`RCache.set_ZB(zb);`
`40`	`39`	`// RImplementation.rmNormal ();`
`41`	`40`	`GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);`
`42`	`41`	`VERIFY(status == GL_FRAMEBUFFER_COMPLETE);`
`43`		`- CHK_GL(glDrawBuffers(cnt, buffers));`
	`42`	`+ CHK_GL(glDrawBuffers(3, buffers));`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`void CRenderTarget::u_setrt(const ref_rt& _1, const ref_rt& _2, GLuint zb)`
`47`	`46`	`{`
`48`	`47`	`VERIFY(_1);`
`49`	`48`	`dwWidth = _1->dwWidth;`
`50`	`49`	`dwHeight = _1->dwHeight;`
`51`		`- GLuint cnt = 0;`
`52`	`50`	`GLenum buffers[2] = { GL_NONE };`
`53`	`51`	`if (_1)`
`54`	`52`	`{`
`55`		`- buffers[cnt++] = GL_COLOR_ATTACHMENT0;`
	`53`	`+ buffers[0] = GL_COLOR_ATTACHMENT0;`
`56`	`54`	`RCache.set_RT(_1->pRT, 0);`
`57`	`55`	`}`
`58`	`56`	`if (_2)`
`59`	`57`	`{`
`60`		`- buffers[cnt++] = GL_COLOR_ATTACHMENT1;`
	`58`	`+ buffers[1] = GL_COLOR_ATTACHMENT1;`
`61`	`59`	`RCache.set_RT(_2->pRT, 1);`
`62`	`60`	`}`
`63`	`61`	`RCache.set_ZB(zb);`
`64`	`62`	`// RImplementation.rmNormal ();`
`65`	`63`	`GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);`
`66`	`64`	`VERIFY(status == GL_FRAMEBUFFER_COMPLETE);`
`67`		`- CHK_GL(glDrawBuffers(cnt, buffers));`
	`65`	`+ CHK_GL(glDrawBuffers(2, buffers));`
`68`	`66`	`}`
`69`	`67`
`70`	`68`	`void CRenderTarget::u_setrt(u32 W, u32 H, GLuint _1, GLuint _2, GLuint _3, GLuint zb)`
`71`	`69`	`{`
`72`	`70`	`dwWidth = W;`
`73`	`71`	`dwHeight = H;`
`74`		`- GLuint cnt = 0;`
`75`	`72`	`GLenum buffers[3] = { GL_NONE };`
`76`	`73`	`if (_1)`
`77`	`74`	`{`
`78`		`- buffers[cnt++] = GL_COLOR_ATTACHMENT0;`
	`75`	`+ buffers[0] = GL_COLOR_ATTACHMENT0;`
`79`	`76`	`RCache.set_RT(_1, 0);`
`80`	`77`	`}`
`81`	`78`	`if (_2)`
`82`	`79`	`{`
`83`		`- buffers[cnt++] = GL_COLOR_ATTACHMENT1;`
	`80`	`+ buffers[1] = GL_COLOR_ATTACHMENT1;`
`84`	`81`	`RCache.set_RT(_2, 1);`
`85`	`82`	`}`
`86`	`83`	`if (_3)`
`87`	`84`	`{`
`88`		`- buffers[cnt++] = GL_COLOR_ATTACHMENT2;`
	`85`	`+ buffers[2] = GL_COLOR_ATTACHMENT2;`
`89`	`86`	`RCache.set_RT(_3, 2);`
`90`	`87`	`}`
`91`	`88`	`RCache.set_ZB(zb);`
`92`	`89`	`// RImplementation.rmNormal ();`
`93`	`90`	`GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);`
`94`	`91`	`VERIFY(status == GL_FRAMEBUFFER_COMPLETE);`
`95`		`- CHK_GL(glDrawBuffers(cnt, buffers));`
	`92`	`+ CHK_GL(glDrawBuffers(3, buffers));`
`96`	`93`	`}`
`97`	`94`
`98`	`95`	`void CRenderTarget::u_stencil_optimize (eStencilOptimizeMode eSOM)`