Merge branch 'master' of https://github.com/Swartz27/cop

Author: Pavel Kovalenko

src/engine/Layers/xrRender/DetailManager_VS.cpp

@@ -319,7 +319,11 @@ void	CDetailManager::hw_Render_dump		(ref_constant x_array, u32 var_id, u32 lod_
 				RCache.stat.r.s_details.add	(dwCNT_verts);
 			}
 			// Clean up
+<<<<<<< HEAD
+			vis.clear_not_free			();
+=======
       vis.clear_not_free ();      
+>>>>>>> origin/master
 		}
 		vOffset		+=	hw_BatchSize * Object.number_vertices;
 		iOffset		+=	hw_BatchSize * Object.number_indices;

src/engine/Layers/xrRenderPC_R2/blender_deffer_aref.cpp

@@ -41,24 +41,18 @@ void	CBlender_deffer_aref::Compile(CBlender_Compile& C)
 		case SE_R2_NORMAL_HQ:
 		case SE_R2_NORMAL_LQ:
 			if (lmapped)	{
-				C.r_Pass			("lmapE","lmapE",TRUE,TRUE,TRUE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
+				C.r_Pass			("lmapE","lmapE",TRUE,TRUE,FALSE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
 				C.r_Sampler			("s_base",	C.L_textures[0]	);
 				C.r_Sampler			("s_lmap",	C.L_textures[1]	);
 				C.r_Sampler_clf		("s_hemi",	*C.L_textures[2]);
 				C.r_Sampler			("s_env",	r2_T_envs0,		false,D3DTADDRESS_CLAMP);
 				C.r_End				();
 			} else {
-				C.r_Pass			("vert", "vert", TRUE,TRUE,TRUE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
+				C.r_Pass			("vert", "vert", TRUE,TRUE,FALSE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
 				C.r_Sampler			("s_base",	C.L_textures[0]	);
 				C.r_End				();
 			}
 			break;
-		case SE_R2_SHADOW:		// smap
-			if (RImplementation.o.HW_smap)	C.r_Pass	("shadow_direct_base_aref","shadow_direct_base_aref",FALSE,TRUE,TRUE,FALSE,D3DBLEND_ZERO,D3DBLEND_ONE,TRUE,220);
-			else							C.r_Pass	("shadow_direct_base_aref","shadow_direct_base_aref",FALSE);
-			C.r_Sampler		("s_base",C.L_textures[0]);
-			C.r_End			();
-			break;
 		default:
 			break;
 		}

src/engine/Layers/xrRenderPC_R3/blender_deffer_aref.cpp

@@ -43,7 +43,7 @@ void	CBlender_deffer_aref::Compile(CBlender_Compile& C)
 		case SE_R2_NORMAL_LQ:
 			if (lmapped)	
 			{
-				C.r_Pass			("lmapE","lmapE",TRUE,TRUE,TRUE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
+				C.r_Pass			("lmapE","lmapE",TRUE,TRUE,FALSE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
 				//C.r_Sampler			("s_base",	C.L_textures[0]	);
 				//C.r_Sampler			("s_lmap",	C.L_textures[1]	);
 				//C.r_Sampler_clf		("s_hemi",	*C.L_textures[2]);
@@ -61,21 +61,13 @@ void	CBlender_deffer_aref::Compile(CBlender_Compile& C)
 			} 
 			else 
 			{
-				C.r_Pass			("vert", "vert", TRUE,TRUE,TRUE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
+				C.r_Pass			("vert", "vert", TRUE,TRUE,FALSE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
 				//C.r_Sampler			("s_base",	C.L_textures[0]	);
 				C.r_dx10Texture		("s_base",	C.L_textures[0]);
 				C.r_dx10Sampler		("smp_base");
 				C.r_End				();
 			}
 			break;
-		case SE_R2_SHADOW:		// smap
-			C.r_Pass			("shadow_direct_base_aref","shadow_direct_base_aref",	FALSE,TRUE,TRUE,FALSE);
-			C.r_dx10Texture		("s_base",C.L_textures[0]);
-			C.r_dx10Sampler		("smp_base");
-			C.r_dx10Sampler		("smp_linear");
-			C.r_ColorWriteEnable(false, false, false, false);
-			C.r_End			();
-			break;      
 		default:
 			break;
 		}

src/engine/Layers/xrRenderPC_R4/blender_deffer_aref.cpp

@@ -43,7 +43,7 @@ void	CBlender_deffer_aref::Compile(CBlender_Compile& C)
 		case SE_R2_NORMAL_LQ:
 			if (lmapped)	
 			{
-				C.r_Pass			("lmapE","lmapE",TRUE,TRUE,TRUE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
+				C.r_Pass			("lmapE","lmapE",TRUE,TRUE,FALSE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
 				//C.r_Sampler			("s_base",	C.L_textures[0]	);
 				//C.r_Sampler			("s_lmap",	C.L_textures[1]	);
 				//C.r_Sampler_clf		("s_hemi",	*C.L_textures[2]);
@@ -61,21 +61,13 @@ void	CBlender_deffer_aref::Compile(CBlender_Compile& C)
 			} 
 			else 
 			{
-				C.r_Pass			("vert", "vert", TRUE,TRUE,TRUE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
+				C.r_Pass			("vert", "vert", TRUE,TRUE,FALSE,TRUE,D3DBLEND_SRCALPHA,	D3DBLEND_INVSRCALPHA,	TRUE, oAREF.value);
 				//C.r_Sampler			("s_base",	C.L_textures[0]	);
 				C.r_dx10Texture		("s_base",	C.L_textures[0]);
 				C.r_dx10Sampler		("smp_base");
 				C.r_End				();
 			}
 			break;
-		case SE_R2_SHADOW:		// smap
-			C.r_Pass			("shadow_direct_base_aref","shadow_direct_base_aref",	FALSE,TRUE,TRUE,FALSE);
-			C.r_dx10Texture		("s_base",C.L_textures[0]);
-			C.r_dx10Sampler		("smp_base");
-			C.r_dx10Sampler		("smp_linear");
-			C.r_ColorWriteEnable(false, false, false, false);
-			C.r_End			();
-			break;      
 		default:
 			break;
 		}