OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-18 14:00:05 +00:00
Code Issues Projects Releases Wiki Activity

Common: Cleanup emu_window includes.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2015-06-21 14:02:11 +01:00
parent 1775adc34c
commit 22ae87530b
5 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/emu_window.cpp
View File

@ -2,6 +2,12 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <cmath>
#include "common/assert.h"
#include "common/key_map.h"
#include "emu_window.h" #include "emu_window.h"
#include "video_core/video_core.h" #include "video_core/video_core.h"

12
src/common/emu_window.h
View File

@ -4,11 +4,17 @@
#pragma once #pragma once
#include <tuple>
#include <utility>
#include "common/common_types.h" #include "common/common_types.h"
#include "common/key_map.h"
#include "common/math_util.h" #include "common/math_util.h"
#include "common/scm_rev.h"
#include "common/string_util.h" #include "core/hle/service/hid/hid.h"
namespace KeyMap {
struct HostDeviceKey;
}
/** /**
* Abstraction class used to provide an interface between emulation code and the frontend * Abstraction class used to provide an interface between emulation code and the frontend

6
src/video_core/pica.h
View File

@ -5,10 +5,10 @@
#pragma once #pragma once
#include <array> #include <array>
#include <cmath>
#include <cstddef> #include <cstddef>
#include <initializer_list>
#include <map> #include <map>
#include <vector> #include <string>
#include "common/assert.h" #include "common/assert.h"
#include "common/bit_field.h" #include "common/bit_field.h"
@ -1014,7 +1014,7 @@ struct float24 {
u32 mantissa = hex & 0xFFFF; u32 mantissa = hex & 0xFFFF;
u32 exponent = (hex >> 16) & 0x7F; u32 exponent = (hex >> 16) & 0x7F;
u32 sign = hex >> 23; u32 sign = hex >> 23;
ret.value = powf(2.0f, (float)exponent-63.0f) * (1.0f + mantissa * powf(2.0f, -16.f)); ret.value = std::pow(2.0f, (float)exponent-63.0f) * (1.0f + mantissa * std::pow(2.0f, -16.f));
if (sign) if (sign)
ret.value = -ret.value; ret.value = -ret.value;
} }

5
src/video_core/vertex_shader.h
View File

@ -4,11 +4,10 @@
#pragma once #pragma once
#include <initializer_list> #include <type_traits>
#include <common/common_types.h> #include "common/vector_math.h"
#include "math.h"
#include "pica.h" #include "pica.h"
namespace Pica { namespace Pica {

7
src/video_core/video_core.h
View File

@ -4,12 +4,11 @@
#pragma once #pragma once
#include "common/emu_window.h"
#include "renderer_base.h"
#include <atomic> #include <atomic>
class EmuWindow;
class RendererBase;
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// Video Core namespace // Video Core namespace