Skip to content

Commit cc96082

Browse files
intorrintorr
committed
Strange fixes for OpenGL render on two max quality levels. Why not use nullptr?
1 parent 3b46e4a commit cc96082

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎src/Layers/xrRenderPC_GL/blender_bloom_build.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ void CBlender_bloom_build::Compile(CBlender_Compile& C)
1919
C.r_End();
2020
break;
2121
case 1: // X-filter
22-
C.r_Pass("stub_notransform_filter", "bloom_filter", nullptr, false, FALSE);
22+
C.r_Pass("stub_notransform_filter", "bloom_filter", FALSE, FALSE, FALSE);
2323
C.r_Sampler_clf("s_bloom", r2_RT_bloom1);
2424
C.r_End();
2525
break;
2626
case 2: // Y-filter
27-
C.r_Pass("stub_notransform_filter", "bloom_filter", nullptr, false, FALSE);
27+
C.r_Pass("stub_notransform_filter", "bloom_filter", FALSE, FALSE, FALSE);
2828
C.r_Sampler_clf("s_bloom", r2_RT_bloom2);
2929
C.r_End();
3030
break;
3131
case 3: // FF-filter_P0
32-
C.r_Pass("stub_notransform_build", "bloom_filter_f", nullptr, false, FALSE);
32+
C.r_Pass("stub_notransform_build", "bloom_filter_f", FALSE, FALSE, FALSE);
3333
C.r_Sampler_clf("s_bloom", r2_RT_bloom1);
3434
C.r_End();
3535
break;
3636
case 4: // FF-filter_P1
37-
C.r_Pass("stub_notransform_build", "bloom_filter_f", nullptr, false, FALSE);
37+
C.r_Pass("stub_notransform_build", "bloom_filter_f", FALSE, FALSE, FALSE);
3838
C.r_Sampler_clf("s_bloom", r2_RT_bloom2);
3939
C.r_End();
4040
break;

‎src/Layers/xrRenderPC_GL/blender_combine.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void CBlender_combine::Compile(CBlender_Compile& C)
3434
C.r_End();
3535
break;
3636
case 1: // aa-edge-detection + AA :)
37-
C.r_Pass("stub_notransform_aa_AA", "combine_2_AA", nullptr, false, FALSE);
37+
C.r_Pass("stub_notransform_aa_AA", "combine_2_AA", FALSE, FALSE, FALSE);
3838
C.r_Sampler_rtf("s_position", r2_RT_P);
3939
C.r_Sampler_rtf("s_normal", r2_RT_N);
4040
C.r_Sampler_clf("s_image", r2_RT_generic0);
@@ -44,7 +44,7 @@ void CBlender_combine::Compile(CBlender_Compile& C)
4444
break;
4545
case 2: // non-AA
4646
// Can use simpler VS (need only Tex0)
47-
C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA", nullptr, false, FALSE);
47+
C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA", FALSE, FALSE, FALSE);
4848
C.r_Sampler_rtf("s_position", r2_RT_P);
4949
C.r_Sampler_rtf("s_normal", r2_RT_N);
5050
C.r_Sampler_clf("s_image", r2_RT_generic0);
@@ -53,7 +53,7 @@ void CBlender_combine::Compile(CBlender_Compile& C)
5353
C.r_End();
5454
break;
5555
case 3: // aa-edge-detection + AA :) + DISTORTION
56-
C.r_Pass("stub_notransform_aa_AA", "combine_2_AA_D", nullptr, false, FALSE);
56+
C.r_Pass("stub_notransform_aa_AA", "combine_2_AA_D", FALSE, FALSE, FALSE);
5757
C.r_Sampler_rtf("s_position", r2_RT_P);
5858
C.r_Sampler_rtf("s_normal", r2_RT_N);
5959
C.r_Sampler_clf("s_image", r2_RT_generic0);
@@ -63,7 +63,7 @@ void CBlender_combine::Compile(CBlender_Compile& C)
6363
break;
6464
case 4: // non-AA + DISTORTION
6565
// Can use simpler VS (need only Tex0)
66-
C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA_D", nullptr, false, FALSE);
66+
C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA_D", FALSE, FALSE, FALSE);
6767
C.r_Sampler_rtf("s_position", r2_RT_P);
6868
C.r_Sampler_rtf("s_normal", r2_RT_N);
6969
C.r_Sampler_clf("s_image", r2_RT_generic0);
@@ -113,7 +113,7 @@ void CBlender_combine_msaa::Compile(CBlender_Compile& C)
113113
C.r_End();
114114
break;
115115
case 1: // aa-edge-detection + AA :)
116-
C.r_Pass("stub_notransform_aa_AA", "combine_2_AA", nullptr, false, FALSE);
116+
C.r_Pass("stub_notransform_aa_AA", "combine_2_AA", FALSE, FALSE, FALSE);
117117
C.r_Sampler_rtf("s_position", r2_RT_P);
118118
C.r_Sampler_rtf("s_normal", r2_RT_N);
119119
C.r_Sampler_clf("s_image", r2_RT_generic0);
@@ -123,7 +123,7 @@ void CBlender_combine_msaa::Compile(CBlender_Compile& C)
123123
break;
124124
case 2: // non-AA
125125
// Can use simpler VS (need only Tex0)
126-
C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA", nullptr, false, TRUE);
126+
C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA", FALSE, FALSE, TRUE);
127127
C.r_Sampler_rtf("s_position", r2_RT_P);
128128
C.r_Sampler_rtf("s_normal", r2_RT_N);
129129
C.r_Sampler_clf("s_image", r2_RT_generic0);
@@ -132,7 +132,7 @@ void CBlender_combine_msaa::Compile(CBlender_Compile& C)
132132
C.r_End();
133133
break;
134134
case 3: // aa-edge-detection + AA :) + DISTORTION
135-
C.r_Pass("stub_notransform_aa_AA", "combine_2_AA_D", nullptr, false, FALSE);
135+
C.r_Pass("stub_notransform_aa_AA", "combine_2_AA_D", FALSE, FALSE, FALSE);
136136
C.r_Sampler_rtf("s_position", r2_RT_P);
137137
C.r_Sampler_rtf("s_normal", r2_RT_N);
138138
C.r_Sampler_clf("s_image", r2_RT_generic0);
@@ -142,7 +142,7 @@ void CBlender_combine_msaa::Compile(CBlender_Compile& C)
142142
break;
143143
case 4: // non-AA + DISTORTION
144144
// Can use simpler VS (need only Tex0)
145-
C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA_D", nullptr, false, TRUE);
145+
C.r_Pass("stub_notransform_aa_AA", "combine_2_NAA_D", FALSE, FALSE, TRUE);
146146
C.r_Sampler_rtf("s_position", r2_RT_P);
147147
C.r_Sampler_rtf("s_normal", r2_RT_N);
148148
C.r_Sampler_clf("s_image", r2_RT_generic0);

‎src/Layers/xrRenderPC_GL/blender_deffer_aref.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void CBlender_deffer_aref::Compile(CBlender_Compile& C)
4747
case SE_R2_NORMAL_LQ:
4848
if (lmapped)
4949
{
50-
C.r_Pass("lmapE", "lmapE", true,TRUE,FALSE,TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA, TRUE,
50+
C.r_Pass("lmapE", "lmapE", TRUE,TRUE,FALSE,TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA, TRUE,
5151
oAREF.value);
5252
C.r_Sampler("s_base", C.L_textures[0]);
5353
C.r_Sampler("s_lmap", C.L_textures[1]);
@@ -57,7 +57,7 @@ void CBlender_deffer_aref::Compile(CBlender_Compile& C)
5757
}
5858
else
5959
{
60-
C.r_Pass("vert", "vert", true,TRUE,FALSE,TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA, TRUE,
60+
C.r_Pass("vert", "vert", TRUE,TRUE,FALSE,TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA, TRUE,
6161
oAREF.value);
6262
C.r_Sampler("s_base", C.L_textures[0]);
6363
C.r_End();
@@ -126,7 +126,7 @@ void CBlender_deffer_aref::Compile(CBlender_Compile& C)
126126
case SE_R2_SHADOW: // smap
127127
// 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);
128128
// else C.r_Pass ("shadow_direct_base_aref","shadow_direct_base_aref",FALSE);
129-
C.r_Pass("shadow_direct_base_aref", "shadow_direct_base_aref", nullptr, true,TRUE,FALSE);
129+
C.r_Pass("shadow_direct_base_aref", "shadow_direct_base_aref", FALSE, TRUE,TRUE,FALSE);
130130
C.r_Sampler("s_base", C.L_textures[0]);
131131
C.r_ColorWriteEnable(false, false, false, false);
132132
C.r_End();

‎src/Layers/xrRenderPC_GL/blender_deffer_flat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void CBlender_deffer_flat::Compile(CBlender_Compile& C)
6767
case SE_R2_SHADOW: // smap-direct
6868
//if (RImplementation.o.HW_smap) C.r_Pass ("shadow_direct_base","dumb", FALSE,TRUE,TRUE,FALSE);
6969
//else C.r_Pass ("shadow_direct_base","shadow_direct_base",FALSE);
70-
C.r_Pass("shadow_direct_base", "dumb", nullptr, true,TRUE,FALSE);
70+
C.r_Pass("shadow_direct_base", "dumb", FALSE, TRUE,TRUE,FALSE);
7171
C.r_Sampler("s_base", C.L_textures[0]);
7272
C.r_ColorWriteEnable(false, false, false, false);
7373
C.r_End();

‎src/Layers/xrRenderPC_GL/blender_deffer_model.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void CBlender_deffer_model::Compile(CBlender_Compile& C)
8080
case 0: //
8181
case 1: //
8282
vsname = psname = "model_def_lq";
83-
C.r_Pass(vsname, psname, true,TRUE,FALSE,TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA, TRUE, oAREF.value);
83+
C.r_Pass(vsname, psname, TRUE,TRUE,FALSE,TRUE, D3DBLEND_SRCALPHA, D3DBLEND_INVSRCALPHA, TRUE, oAREF.value);
8484
C.r_Sampler("s_base", C.L_textures[0]);
8585
C.r_End();
8686
break;
@@ -143,7 +143,7 @@ void CBlender_deffer_model::Compile(CBlender_Compile& C)
143143
{
144144
//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);
145145
//else C.r_Pass ("shadow_direct_model_aref","shadow_direct_base_aref", FALSE);
146-
C.r_Pass("shadow_direct_model_aref", "shadow_direct_base_aref", false,TRUE,TRUE,FALSE, D3DBLEND_ZERO,
146+
C.r_Pass("shadow_direct_model_aref", "shadow_direct_base_aref", FALSE,TRUE,TRUE,FALSE, D3DBLEND_ZERO,
147147
D3DBLEND_ONE,TRUE, 220);
148148
C.r_Sampler("s_base", C.L_textures[0]);
149149
C.r_ColorWriteEnable(false, false, false, false);
@@ -152,7 +152,7 @@ void CBlender_deffer_model::Compile(CBlender_Compile& C)
152152
}
153153
//if (RImplementation.o.HW_smap) C.r_Pass ("shadow_direct_model","dumb", FALSE,TRUE,TRUE,FALSE);
154154
//else C.r_Pass ("shadow_direct_model","shadow_direct_base",FALSE);
155-
C.r_Pass("shadow_direct_model", "dumb", nullptr, true,TRUE,FALSE);
155+
C.r_Pass("shadow_direct_model", "dumb", FALSE, TRUE,TRUE,FALSE);
156156
C.r_Sampler("s_base", C.L_textures[0]);
157157
C.r_ColorWriteEnable(false, false, false, false);
158158
C.r_End();

0 commit comments

Comments
 (0)