← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/RenderExt.cpp

  • 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/RenderExt.cpp
17
17
 
18
18
*/
19
19
 
20
 
#include <SDL_opengl.h>
 
20
#include "osal_opengl.h"
21
21
#include "OGLDebug.h"
22
22
#include "FrameBuffer.h"
23
23
#include "Render.h"
82
82
            gti.LeftToLoad      = left;
83
83
            gti.TopToLoad       = top;
84
84
 
85
 
            gti.WidthToCreate       = width;
86
 
            gti.HeightToCreate      = height;
 
85
            gti.WidthToCreate   = width;
 
86
            gti.HeightToCreate  = height;
87
87
        }
88
88
 
89
89
        if( gti.Size == TXT_SIZE_4b )
90
90
        {
91
 
            gti.Pitch   = g_CI.dwWidth >> 1;
 
91
            gti.Pitch = g_CI.dwWidth >> 1;
92
92
        }
93
93
        else
94
94
        {
95
 
            gti.Pitch   = g_CI.dwWidth << (gti.Size-1);
96
 
 
 
95
            gti.Pitch = g_CI.dwWidth << (gti.Size-1);
97
96
        }
98
97
    }
99
98
 
130
129
    gti.Palette = 0;
131
130
    gti.TLutFmt = TLUT_FMT_RGBA16;  //RGBA16
132
131
    gti.PalAddress = 0;
133
 
    gti.bSwapped    = FALSE;
 
132
    gti.bSwapped = FALSE;
134
133
    gti.Address = 0;
135
 
    gti.LeftToLoad      = 0;
136
 
    gti.TopToLoad       = 0;
137
 
    gti.WidthToCreate       = width;
138
 
    gti.HeightToCreate      = height;
 
134
    gti.LeftToLoad = 0;
 
135
    gti.TopToLoad = 0;
 
136
    gti.WidthToCreate = width;
 
137
    gti.HeightToCreate = height;
139
138
 
140
139
    gti.Pitch   = pitch;
141
140