Skip to content

Commit

Permalink
Strange fixes for OpenGL render on two max quality levels. Why not us…
Browse files Browse the repository at this point in the history 
…e nullptr?
  • Loading branch information
@intorr
intorr committed Feb 2, 2018
1 parent 3b46e4a commit cc96082
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions src/Layers/xrRenderPC_GL/blender_bloom_build.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions src/Layers/xrRenderPC_GL/blender_combine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/Layers/xrRenderPC_GL/blender_deffer_aref.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand All @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRenderPC_GL/blender_deffer_flat.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 3 additions & 3 deletions src/Layers/xrRenderPC_GL/blender_deffer_model.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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();
Expand Down

0 comments on commit cc96082

Please sign in to comment.