diff --git a/src/Layers/xrRenderPC_GL/blender_bloom_build.cpp b/src/Layers/xrRenderPC_GL/blender_bloom_build.cpp index 4310f535388..610aa37daf4 100644 --- a/src/Layers/xrRenderPC_GL/blender_bloom_build.cpp +++ b/src/Layers/xrRenderPC_GL/blender_bloom_build.cpp @@ -19,22 +19,22 @@ void CBlender_bloom_build::Compile(CBlender_Compile& C) C.r_End(); break; case 1: // X-filter - C.r_Pass("stub_notransform_filter", "bloom_filter", nullptr, false, FALSE); + C.r_Pass("stub_notransform_filter", "bloom_filter", FALSE, FALSE, FALSE); C.r_Sampler_clf("s_bloom", r2_RT_bloom1); C.r_End(); break; case 2: // Y-filter - C.r_Pass("stub_notransform_filter", "bloom_filter", nullptr, false, FALSE); + C.r_Pass("stub_notransform_filter", "bloom_filter", FALSE, FALSE, FALSE); C.r_Sampler_clf("s_bloom", r2_RT_bloom2); C.r_End(); break; case 3: // FF-filter_P0 - C.r_Pass("stub_notransform_build", "bloom_filter_f", nullptr, false, FALSE); + C.r_Pass("stub_notransform_build", "bloom_filter_f", FALSE, FALSE, FALSE); C.r_Sampler_clf("s_bloom", r2_RT_bloom1); C.r_End(); break; case 4: // FF-filter_P1 - C.r_Pass("stub_notransform_build", "bloom_filter_f", nullptr, false, FALSE); + C.r_Pass("stub_notransform_build", "bloom_filter_f", FALSE, FALSE, FALSE); C.r_Sampler_clf("s_bloom", r2_RT_bloom2); C.r_End(); break; diff --git a/src/Layers/xrRenderPC_GL/blender_combine.cpp b/src/Layers/xrRenderPC_GL/blender_combine.cpp index d6774ff9238..4db7fd15459 100644 --- a/src/Layers/xrRenderPC_GL/blender_combine.cpp +++ b/src/Layers/xrRenderPC_GL/blender_combine.cpp @@ -34,7 +34,7 @@ void CBlender_combine::Compile(CBlender_Compile& C) C.r_End(); break; case 1: // aa-edge-detection + AA :) - C.r_Pass("stub_notransform_aa_AA", "combine_2_AA", nullptr, false, FALSE); + C.r_Pass("stub_notransform_aa_AA", "combine_2_AA", FALSE, FALSE, FALSE); C.r_Sampler_rtf("s_position", r2_RT_P); C.r_Sampler_rtf("s_normal", r2_RT_N); C.r_Sampler_clf("s_image", r2_RT_generic0); @@ -44,7 +44,7 @@ void CBlender_combine::Compile(CBlender_Compile& C) break; case 2: // non-AA // Can use simpler VS (need only Tex0) - C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA", nullptr, false, FALSE); + C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA", FALSE, FALSE, FALSE); C.r_Sampler_rtf("s_position", r2_RT_P); C.r_Sampler_rtf("s_normal", r2_RT_N); C.r_Sampler_clf("s_image", r2_RT_generic0); @@ -53,7 +53,7 @@ void CBlender_combine::Compile(CBlender_Compile& C) C.r_End(); break; case 3: // aa-edge-detection + AA :) + DISTORTION - C.r_Pass("stub_notransform_aa_AA", "combine_2_AA_D", nullptr, false, FALSE); + C.r_Pass("stub_notransform_aa_AA", "combine_2_AA_D", FALSE, FALSE, FALSE); C.r_Sampler_rtf("s_position", r2_RT_P); C.r_Sampler_rtf("s_normal", r2_RT_N); C.r_Sampler_clf("s_image", r2_RT_generic0); @@ -63,7 +63,7 @@ void CBlender_combine::Compile(CBlender_Compile& C) break; case 4: // non-AA + DISTORTION // Can use simpler VS (need only Tex0) - C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA_D", nullptr, false, FALSE); + C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA_D", FALSE, FALSE, FALSE); C.r_Sampler_rtf("s_position", r2_RT_P); C.r_Sampler_rtf("s_normal", r2_RT_N); C.r_Sampler_clf("s_image", r2_RT_generic0); @@ -113,7 +113,7 @@ void CBlender_combine_msaa::Compile(CBlender_Compile& C) C.r_End(); break; case 1: // aa-edge-detection + AA :) - C.r_Pass("stub_notransform_aa_AA", "combine_2_AA", nullptr, false, FALSE); + C.r_Pass("stub_notransform_aa_AA", "combine_2_AA", FALSE, FALSE, FALSE); C.r_Sampler_rtf("s_position", r2_RT_P); C.r_Sampler_rtf("s_normal", r2_RT_N); C.r_Sampler_clf("s_image", r2_RT_generic0); @@ -123,7 +123,7 @@ void CBlender_combine_msaa::Compile(CBlender_Compile& C) break; case 2: // non-AA // Can use simpler VS (need only Tex0) - C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA", nullptr, false, TRUE); + C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA", FALSE, FALSE, TRUE); C.r_Sampler_rtf("s_position", r2_RT_P); C.r_Sampler_rtf("s_normal", r2_RT_N); C.r_Sampler_clf("s_image", r2_RT_generic0); @@ -132,7 +132,7 @@ void CBlender_combine_msaa::Compile(CBlender_Compile& C) C.r_End(); break; case 3: // aa-edge-detection + AA :) + DISTORTION - C.r_Pass("stub_notransform_aa_AA", "combine_2_AA_D", nullptr, false, FALSE); + C.r_Pass("stub_notransform_aa_AA", "combine_2_AA_D", FALSE, FALSE, FALSE); C.r_Sampler_rtf("s_position", r2_RT_P); C.r_Sampler_rtf("s_normal", r2_RT_N); C.r_Sampler_clf("s_image", r2_RT_generic0); @@ -142,7 +142,7 @@ void CBlender_combine_msaa::Compile(CBlender_Compile& C) break; case 4: // non-AA + DISTORTION // Can use simpler VS (need only Tex0) - C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA_D", nullptr, false, TRUE); + C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA_D", FALSE, FALSE, TRUE); C.r_Sampler_rtf("s_position", r2_RT_P); C.r_Sampler_rtf("s_normal", r2_RT_N); C.r_Sampler_clf("s_image", r2_RT_generic0); diff --git a/src/Layers/xrRenderPC_GL/blender_deffer_aref.cpp b/src/Layers/xrRenderPC_GL/blender_deffer_aref.cpp index 4c64d3c41c2..f544f89df07 100644 --- a/src/Layers/xrRenderPC_GL/blender_deffer_aref.cpp +++ b/src/Layers/xrRenderPC_GL/blender_deffer_aref.cpp @@ -47,7 +47,7 @@ void CBlender_deffer_aref::Compile(CBlender_Compile& C) case SE_R2_NORMAL_LQ: if (lmapped) { - C.r_Pass("lmapE", "lmapE", true,TRUE,FALSE,TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA, TRUE, + 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]); @@ -57,7 +57,7 @@ void CBlender_deffer_aref::Compile(CBlender_Compile& C) } else { - C.r_Pass("vert", "vert", true,TRUE,FALSE,TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA, TRUE, + 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(); @@ -126,7 +126,7 @@ void CBlender_deffer_aref::Compile(CBlender_Compile& C) 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_Pass("shadow_direct_base_aref", "shadow_direct_base_aref", nullptr, true,TRUE,FALSE); + C.r_Pass("shadow_direct_base_aref", "shadow_direct_base_aref", FALSE, TRUE,TRUE,FALSE); C.r_Sampler("s_base", C.L_textures[0]); C.r_ColorWriteEnable(false, false, false, false); C.r_End(); diff --git a/src/Layers/xrRenderPC_GL/blender_deffer_flat.cpp b/src/Layers/xrRenderPC_GL/blender_deffer_flat.cpp index 88367fe3cf8..4c568dce681 100644 --- a/src/Layers/xrRenderPC_GL/blender_deffer_flat.cpp +++ b/src/Layers/xrRenderPC_GL/blender_deffer_flat.cpp @@ -67,7 +67,7 @@ void CBlender_deffer_flat::Compile(CBlender_Compile& C) case SE_R2_SHADOW: // smap-direct //if (RImplementation.o.HW_smap) C.r_Pass ("shadow_direct_base","dumb", FALSE,TRUE,TRUE,FALSE); //else C.r_Pass ("shadow_direct_base","shadow_direct_base",FALSE); - C.r_Pass("shadow_direct_base", "dumb", nullptr, true,TRUE,FALSE); + C.r_Pass("shadow_direct_base", "dumb", FALSE, TRUE,TRUE,FALSE); C.r_Sampler("s_base", C.L_textures[0]); C.r_ColorWriteEnable(false, false, false, false); C.r_End(); diff --git a/src/Layers/xrRenderPC_GL/blender_deffer_model.cpp b/src/Layers/xrRenderPC_GL/blender_deffer_model.cpp index b9ba2d2cce2..21af1461133 100644 --- a/src/Layers/xrRenderPC_GL/blender_deffer_model.cpp +++ b/src/Layers/xrRenderPC_GL/blender_deffer_model.cpp @@ -80,7 +80,7 @@ void CBlender_deffer_model::Compile(CBlender_Compile& C) case 0: // case 1: // vsname = psname = "model_def_lq"; - C.r_Pass(vsname, psname, true,TRUE,FALSE,TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA, TRUE, oAREF.value); + C.r_Pass(vsname, psname, TRUE,TRUE,FALSE,TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA, TRUE, oAREF.value); C.r_Sampler("s_base", C.L_textures[0]); C.r_End(); break; @@ -143,7 +143,7 @@ void CBlender_deffer_model::Compile(CBlender_Compile& C) { //if (RImplementation.o.HW_smap) C.r_Pass ("shadow_direct_model_aref","shadow_direct_base_aref", FALSE,TRUE,TRUE,FALSE,D3DBLEND_ZERO,D3DBLEND_ONE,TRUE,220); //else C.r_Pass ("shadow_direct_model_aref","shadow_direct_base_aref", FALSE); - C.r_Pass("shadow_direct_model_aref", "shadow_direct_base_aref", false,TRUE,TRUE,FALSE, D3DBLEND_ZERO, + C.r_Pass("shadow_direct_model_aref", "shadow_direct_base_aref", FALSE,TRUE,TRUE,FALSE, D3DBLEND_ZERO, D3DBLEND_ONE,TRUE, 220); C.r_Sampler("s_base", C.L_textures[0]); C.r_ColorWriteEnable(false, false, false, false); @@ -152,7 +152,7 @@ void CBlender_deffer_model::Compile(CBlender_Compile& C) } //if (RImplementation.o.HW_smap) C.r_Pass ("shadow_direct_model","dumb", FALSE,TRUE,TRUE,FALSE); //else C.r_Pass ("shadow_direct_model","shadow_direct_base",FALSE); - C.r_Pass("shadow_direct_model", "dumb", nullptr, true,TRUE,FALSE); + C.r_Pass("shadow_direct_model", "dumb", FALSE, TRUE,TRUE,FALSE); C.r_Sampler("s_base", C.L_textures[0]); C.r_ColorWriteEnable(false, false, false, false); C.r_End();