← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mupen64plus-video-rice/trusty-proposed

« back to all changes in this revision

Viewing changes to src/RSP_GBI1.h

  • Committer: Package Import Robot
  • Author(s): Sven Eckelmann
  • Date: 2013-07-05 22:53:25 UTC
  • mfrom: (1.2.2) (3.1.9 experimental)
  • Revision ID: package-import@ubuntu.com-20130705225325-k0fbb2m44xnrju66
Tags: 2.0-1
* New Upstream Version
* Upload to unstable
* debian/control:
  - Build-Depend on debhelper 9.20130604 for support of parameters when
    detecting targets in dh_auto_*
* debian/rules:
  - Work around new debhelper 9.20130624 dh_auto_{clean,test} behavior
    which is causing a FTBFS by adding an explicit
    override_dh_auto_{clean,test} rule
* debian/watch:
  - Verify new upstream versions using GPG key 954F81B094AA5BB226F5

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/RSP_GBI1.h
108
108
            if (!bTrisAdded)
109
109
            {
110
110
                if( bTexturesAreEnabled )
111
 
            {
112
 
                PrepareTextures();
113
 
                InitVertexTextureConstants();
114
 
            }
 
111
                {
 
112
                    PrepareTextures();
 
113
                    InitVertexTextureConstants();
 
114
                }
 
115
 
115
116
                CRender::g_pRender->SetCombinerAndBlender();
116
117
                bTrisAdded = true;
117
118
            }
125
126
            if (!bTrisAdded)
126
127
            {
127
128
                if( bTexturesAreEnabled )
128
 
            {
129
 
                PrepareTextures();
130
 
                InitVertexTextureConstants();
131
 
            }
 
129
                {
 
130
                    PrepareTextures();
 
131
                    InitVertexTextureConstants();
 
132
                }
 
133
 
132
134
                CRender::g_pRender->SetCombinerAndBlender();
133
135
                bTrisAdded = true;
134
136
            }
161
163
{
162
164
    SP_Timing(RSP_GBI1_BranchZ);
163
165
 
164
 
    uint32 vtx = ((gfx->words.w0)&0xFFF)>1;
 
166
    uint32 vtx = ((gfx->words.w0)&0xFFF)>>1;
165
167
    float vtxdepth = g_vecProjected[vtx].z/g_vecProjected[vtx].w;
166
168
 
167
169
#ifdef DEBUGGER
319
321
    }
320
322
    else
321
323
    {
322
 
        
323
324
        LOG_UCODE("      (Normal Light)");
324
325
 
325
326
        SetLightCol(dwLight, gRSPn64lights[dwLight].dwRGBA);
373
374
 
374
375
    CRender::g_pRender->SetViewport(nLeft, nTop, nRight, nBottom, maxZ);
375
376
 
376
 
 
377
377
    LOG_UCODE("        Scale: %d %d %d %d = %d,%d", scale[0], scale[1], scale[2], scale[3], nWidth, nHeight);
378
378
    LOG_UCODE("        Trans: %d %d %d %d = %d,%d", trans[0], trans[1], trans[2], trans[3], nCenterX, nCenterY);
379
379
}