/[pcsx2_0.9.7]/patches/revision_patches/r3760/fix-warnings/r3760-plugins-ZZOgl-ZZoglFlush.cpp-ZeroGS_SetTexVariables_dont_mix_dReals_with_ints_use_floats_fix.patch
ViewVC logotype

Diff of /patches/revision_patches/r3760/fix-warnings/r3760-plugins-ZZOgl-ZZoglFlush.cpp-ZeroGS_SetTexVariables_dont_mix_dReals_with_ints_use_floats_fix.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 165 by william, Mon Sep 13 15:44:19 2010 UTC revision 166 by william, Mon Sep 13 15:54:49 2010 UTC
# Line 1  Line 1 
1  --- trunk/plugins/zzogl-pg/opengl/ZZoglFlush.cpp        2010-09-10 06:19:30.709035200 -0400  --- trunk/plugins/zzogl-pg/opengl/ZZoglFlush.cpp        2010-09-13 11:50:38.525953600 -0400
2  +++ trunk/plugins/zzogl-pg/opengl/ZZoglFlush.cpp.patched        2010-09-10 06:09:29.716660400 -0400  +++ trunk/plugins/zzogl-pg/opengl/ZZoglFlush.cpp.patched        2010-09-13 11:49:38.040444600 -0400
3  @@ -2135,18 +2135,18 @@  @@ -2135,18 +2135,18 @@
4    
5                  valpha2.x = (tex0.tfx == 1) ;                  valpha2.x = (tex0.tfx == 1) ;
# Line 8  Line 8 
8  +               valpha2.z = (tex0.tfx != 1) * 2.0f ;  +               valpha2.z = (tex0.tfx != 1) * 2.0f ;
9                  valpha2.w = (tex0.tfx == 0) ;                  valpha2.w = (tex0.tfx == 0) ;
10    
11                  if (tex0.tcc == 0 || !nNeedAlpha(psm))                  if (tex0.tcc == 0 || !PSMT_ALPHAEXP(psm))
12                  {                  {
13                          valpha.x = 0 ;                          valpha.x = 0 ;
14  -                       valpha.y = (!!tex0.tcc) * (1 + (tex0.tfx == 0)) ;  -                       valpha.y = (!!tex0.tcc) * (1 + (tex0.tfx == 0)) ;
# Line 17  Line 17 
17                  else                  else
18                  {                  {
19  -                       valpha.x = (gs.texa.fta[0])  * (1 + (tex0.tfx == 0)) ;  -                       valpha.x = (gs.texa.fta[0])  * (1 + (tex0.tfx == 0)) ;
20  -                       valpha.y = (gs.texa.fta[psm!=1] - gs.texa.fta[0]) * (1 + (tex0.tfx == 0))  ;  -                       valpha.y = (gs.texa.fta[psm != PSMCT24] - gs.texa.fta[0]) * (1 + (tex0.tfx == 0)) ;
21  +                       valpha.x = (gs.texa.fta[0])  * (1.0f + (tex0.tfx == 0)) ;  +                       valpha.x = (gs.texa.fta[0])  * (1.0f + (tex0.tfx == 0)) ;
22  +                       valpha.y = (gs.texa.fta[psm!=1] - gs.texa.fta[0]) * (1.0f + (tex0.tfx == 0))  ;  +                       valpha.y = (gs.texa.fta[psm != PSMCT24] - gs.texa.fta[0]) * (1.0f + (tex0.tfx == 0)) ;
23    
24                  }                  }
25    
                 valpha.z = (tex0.tfx >= 3) ;  

Legend:
Removed from v.165  
changed lines
  Added in v.166

  ViewVC Help
Powered by ViewVC 1.1.22