DXGL r387 - Code Review

Repository:	DXGL
Revision:	< r386‎ \| r387 \| r388 >
Date:	01:59, 24 June 2013
Author:	admin
Status:	new
Tags:
Comment:	Fix screen filtering with sampler objects.
Modified paths:	/ddraw/glRenderer.cpp (modified) (history)

Diff [purge]

Index: ddraw/glRenderer.cpp
—	—	@@ -1133,7 +1133,11 @@
1134	1134	SetTexture(0,texture);
1135	1135	glUniform1i(shaders[progtype].tex0,0);
1136	1136	}
1137		~~- if(GLEXT_ARB_sampler_objects) ((glDirectDrawSurface7*)NULL)->SetFilter(1,GL_NEAREST,GL_NEAREST);~~
	1137	+ if(GLEXT_ARB_sampler_objects)
	1138	+ {
	1139	+ ((glDirectDrawSurface7*)NULL)->SetFilter(0,GL_NEAREST,GL_NEAREST);
	1140	+ ((glDirectDrawSurface7*)NULL)->SetFilter(1,GL_NEAREST,GL_NEAREST);
	1141	+ }
1138	1142	}
1139	1143	else
1140	1144	{
—	—	@@ -1142,6 +1146,7 @@
1143	1147	SetTexture(0,texture);
1144	1148	glUniform1i(shaders[progtype].tex0,0);
1145	1149	}
	1150	+ if(dxglcfg.scalingfilter && GLEXT_ARB_sampler_objects) ((glDirectDrawSurface7*)NULL)->SetFilter(0,GL_LINEAR,GL_LINEAR);
1146	1151	SetViewport(viewport[0],viewport[1],viewport[2],viewport[3]);
1147	1152	glUniform4f(shaders[progtype].view,view[0],view[1],view[2],view[3]);
1148	1153	if(ddInterface->GetFullscreen())