From: smea <smealum@gmail.com>
Date: Tue, 26 Aug 2014 04:32:00 +0000 (-0700)
Subject: Merge branch 'refactor' of github.com:smealum/ctrulib into refactor
X-Git-Tag: v0.2.0~107
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=d287719900c33e24bf7da181a1c9740ce9aac82f;p=corbenik%2Fctrulib.git

Merge branch 'refactor' of github.com:smealum/ctrulib into refactor

Conflicts:
	libctru/source/gfx.c
---

d287719900c33e24bf7da181a1c9740ce9aac82f
diff --cc libctru/source/gfx.c
index 6492033,fa6fa78..bbc0dd8
--- a/libctru/source/gfx.c
+++ b/libctru/source/gfx.c
@@@ -54,18 -70,6 +73,16 @@@ void gfxSetFramebufferInfo(gfxScreen_t 
  	}
  }
  
 +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;
 +}
 +
- extern u32 __gsp_heap_size;
- 
  void gfxInit()
  {
  	gspInit();