← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/Combiner.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/Combiner.cpp
23
23
 
24
24
//static BOOL g_bHiliteRGBAHack = FALSE;
25
25
 
26
 
//const char * sc_colcombtypes32[32] =
27
 
//{
28
 
//  "Combined    ", "Texel0      ",
29
 
//  "Texel1      ", "Primitive   ", 
30
 
//  "Shade       ", "Environment ",
31
 
//  "1           ", "CombAlp     ",
32
 
//  "Texel0_Alpha", "Texel1_Alpha",
33
 
//  "Prim_Alpha  ", "Shade_Alpha ",
34
 
//  "Env_Alpha   ", "LOD_Fraction",
35
 
//  "PrimLODFrac ", "K5          ",
36
 
//  "?           ", "?           ",
37
 
//  "?           ", "?           ",
38
 
//  "?           ", "?           ",
39
 
//  "?           ", "?           ",
40
 
//  "?           ", "?           ",
41
 
//  "?           ", "?           ",
42
 
//  "?           ", "?           ",
43
 
//  "?           ", "0           "
44
 
//};
45
 
//const char *sc_colcombtypes16[16] =
46
 
//{
47
 
//  "Combined    ", "Texel0      ",
48
 
//  "Texel1      ", "Prim        ", 
49
 
//  "Shade       ", "Environment ",
50
 
//  "1           ", "CombAlp     ",
51
 
//  "Texel0_Alpha", "Texel1_Alpha",
52
 
//  "Prim_Alp    ", "Shade_Alpha ",
53
 
//  "Env_Alpha   ", "LOD_Fraction",
54
 
//  "PrimLOD_Frac", "0           "
55
 
//};
56
 
//const char *sc_colcombtypes8[8] =
57
 
//{
58
 
//  "Combined    ", "Texel0      ",
59
 
//  "Texel1      ", "Primitive   ", 
60
 
//  "Shade       ", "Environment ",
61
 
//  "1           ", "0           ",
62
 
//};
63
26
 
64
27
#ifdef DEBUGGER
65
28
const char *constStrs[] = {
309
272
//*****************************************************************************
310
273
//
311
274
//*****************************************************************************
312
 
//*****************************************************************************
313
 
//
314
 
//*****************************************************************************
315
 
 
316
 
//*****************************************************************************
317
 
//
318
 
//*****************************************************************************
319
275
bool    gUsingPrimColour = false;
320
276
bool    gUsingEnvColour = false;
321
277
 
364
320
{
365
321
#ifdef DEBUGGER
366
322
    LOG_UCODE(cycleTypeStrs[gRDP.otherMode.cycle_type]);
367
 
 
368
323
    if( debuggerDropDecodedMux )
369
324
    {
370
325
        UpdateCombiner(m_pDecodedMux->m_dwMux0, m_pDecodedMux->m_dwMux1);