DXGL r222 - Code Review

Repository:	DXGL
Revision:	< r221‎ \| r222 \| r223 >
Date:	21:20, 31 July 2012
Author:	admin
Status:	new
Tags:
Comment:	Color vertices white when lighting is disabled and vertex color is not specified.
Modified paths:	/ddraw/shadergen.cpp (modified) (history)

Diff [purge]

Index: ddraw/shadergen.cpp
—	—	@@ -282,6 +282,7 @@
283	283	gl_FrontSecondaryColor = (gl_FrontMaterial.specular * specular);\n";
284	284	static const char op_colorvert[] = "gl_FrontColor = rgba0.bgra;\n";
285	285	static const char op_color2vert[] = "gl_FrontSecondaryColor = rgba1.bgra;\n";
	286	+static const char op_colorwhite[] = "gl_FrontColor = vec4(1.0,1.0,1.0,1.0);\n";
286	287	static const char op_colorfragout[] = "gl_FragColor = vec4(color,alpha);\n";
287	288	static const char op_colorfragin[] = "color = gl_Color.rgb;\n\
288	289	alpha = gl_Color.a;\n";
—	—	@@ -511,6 +512,7 @@
512	513	else
513	514	{
514	515	if((id>>35)&1) vsrc->append(op_colorvert);
	516	+ else vsrc->append(op_colorwhite);
515	517	if((id>>36)&1) vsrc->append(op_color2vert);
516	518	}
517	519	int texindex;