Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'threading' of https://github.com/bunnei/citra

Browse source 
Conflicts:
	src/core/hle/function_wrappers.h
	src/core/hle/service/gsp.cpp
This commit is contained in:
bunnei 2014-06-14 12:13:16 -04:00
commit 004df76795
41 changed files with 1279 additions and 1235 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/hw/gpu.h
View file

@ -8,6 +8,9 @@
namespace GPU {
static const u32 kFrameCycles = 268123480 / 60; ///< 268MHz / 60 frames per second
static const u32 kFrameTicks = kFrameCycles / 3; ///< Approximate number of instructions/frame
struct Registers {
enum Id : u32 {
FramebufferTopLeft1 = 0x1EF00468, // Main LCD, first framebuffer for 3D left