summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-03-17 05:40:06 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2016-03-17 05:40:06 +0100
commit0c0fb463f0bf8c9dd179e44751b0a56b22cc6535 (patch)
tree81e8deee2f8245354d90f2280d4566a38b79fbdb
parentMerge pull request #1519 from JayFoxRox/vp-offset-fix (diff)
parentcore/video_core: Make NumIds functions constexpr (diff)
downloadyuzu-0c0fb463f0bf8c9dd179e44751b0a56b22cc6535.tar
yuzu-0c0fb463f0bf8c9dd179e44751b0a56b22cc6535.tar.gz
yuzu-0c0fb463f0bf8c9dd179e44751b0a56b22cc6535.tar.bz2
yuzu-0c0fb463f0bf8c9dd179e44751b0a56b22cc6535.tar.lz
yuzu-0c0fb463f0bf8c9dd179e44751b0a56b22cc6535.tar.xz
yuzu-0c0fb463f0bf8c9dd179e44751b0a56b22cc6535.tar.zst
yuzu-0c0fb463f0bf8c9dd179e44751b0a56b22cc6535.zip
-rw-r--r--src/core/hw/gpu.h8
-rw-r--r--src/core/hw/lcd.h8
-rw-r--r--src/video_core/pica.h8
3 files changed, 12 insertions, 12 deletions
diff --git a/src/core/hw/gpu.h b/src/core/hw/gpu.h
index 2e3a9f779..a00adbf53 100644
--- a/src/core/hw/gpu.h
+++ b/src/core/hw/gpu.h
@@ -263,17 +263,17 @@ struct Regs {
INSERT_PADDING_WORDS(0x9c3);
- static inline size_t NumIds() {
+ static constexpr size_t NumIds() {
return sizeof(Regs) / sizeof(u32);
}
- u32& operator [] (int index) const {
- u32* content = (u32*)this;
+ const u32& operator [] (int index) const {
+ const u32* content = reinterpret_cast<const u32*>(this);
return content[index];
}
u32& operator [] (int index) {
- u32* content = (u32*)this;
+ u32* content = reinterpret_cast<u32*>(this);
return content[index];
}
diff --git a/src/core/hw/lcd.h b/src/core/hw/lcd.h
index bcce6d8cf..3dd877fbf 100644
--- a/src/core/hw/lcd.h
+++ b/src/core/hw/lcd.h
@@ -38,17 +38,17 @@ struct Regs {
u32 backlight_bottom;
INSERT_PADDING_WORDS(0x16F);
- static inline size_t NumIds() {
+ static constexpr size_t NumIds() {
return sizeof(Regs) / sizeof(u32);
}
- u32& operator [] (int index) const {
- u32* content = (u32*)this;
+ const u32& operator [] (int index) const {
+ const u32* content = reinterpret_cast<const u32*>(this);
return content[index];
}
u32& operator [] (int index) {
- u32* content = (u32*)this;
+ u32* content = reinterpret_cast<u32*>(this);
return content[index];
}
diff --git a/src/video_core/pica.h b/src/video_core/pica.h
index 7fb3aa481..337cff8ce 100644
--- a/src/video_core/pica.h
+++ b/src/video_core/pica.h
@@ -1221,17 +1221,17 @@ struct Regs {
// Used for debugging purposes, so performance is not an issue here
static std::string GetCommandName(int index);
- static inline size_t NumIds() {
+ static constexpr size_t NumIds() {
return sizeof(Regs) / sizeof(u32);
}
- u32& operator [] (int index) const {
- u32* content = (u32*)this;
+ const u32& operator [] (int index) const {
+ const u32* content = reinterpret_cast<const u32*>(this);
return content[index];
}
u32& operator [] (int index) {
- u32* content = (u32*)this;
+ u32* content = reinterpret_cast<u32*>(this);
return content[index];
}