]> Chaos Git - corbenik/ctrulib.git/commitdiff
Merge branch 'refactor' of github.com:smealum/ctrulib into refactor
authorsmea <smealum@gmail.com>
Tue, 26 Aug 2014 04:32:00 +0000 (21:32 -0700)
committersmea <smealum@gmail.com>
Tue, 26 Aug 2014 04:32:00 +0000 (21:32 -0700)
Conflicts:
libctru/source/gfx.c

1  2 
libctru/include/3ds/gfx.h
libctru/source/gfx.c

Simple merge
index 6492033be8b3544790a1f9078dbbab4ad727bc08,fa6fa78e310022becc07995b7e462211e88afa1d..bbc0dd841f8f51b1e0f1cfbe44aea4b42b3a4742
@@@ -54,18 -70,6 +73,16 @@@ void gfxSetFramebufferInfo(gfxScreen_t 
        }
  }
  
- extern u32 __gsp_heap_size;
 +void gfxWriteFramebufferInfo(gfxScreen_t screen)
 +{
 +      u8* framebufferInfoHeader=gfxSharedMemory+0x200+gfxThreadID*0x80;
 +      if(screen==GFX_BOTTOM)framebufferInfoHeader+=0x40;
 +      GSP_FramebufferInfo* framebufferInfo=(GSP_FramebufferInfo*)&framebufferInfoHeader[0x4];
 +      framebufferInfoHeader[0x0]^=1;
 +      framebufferInfo[framebufferInfoHeader[0x0]]=(screen==GFX_TOP)?(topFramebufferInfo):(bottomFramebufferInfo);
 +      framebufferInfoHeader[0x1]=1;
 +}
 +
  void gfxInit()
  {
        gspInit();