summaryrefslogtreecommitdiffstats
path: root/src/video_core/pica.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-22 06:12:43 +0100
committerbunnei <bunneidev@gmail.com>2014-12-22 06:12:43 +0100
commit2188af4a653d56fcaf59e90399beb2c355762140 (patch)
treeb9c5bf92b6cebe6ecb7de4685049afdbc54d839d /src/video_core/pica.h
parentMerge pull request #325 from yuriks/cmake-opts (diff)
parentMore warning cleanups (diff)
downloadyuzu-2188af4a653d56fcaf59e90399beb2c355762140.tar
yuzu-2188af4a653d56fcaf59e90399beb2c355762140.tar.gz
yuzu-2188af4a653d56fcaf59e90399beb2c355762140.tar.bz2
yuzu-2188af4a653d56fcaf59e90399beb2c355762140.tar.lz
yuzu-2188af4a653d56fcaf59e90399beb2c355762140.tar.xz
yuzu-2188af4a653d56fcaf59e90399beb2c355762140.tar.zst
yuzu-2188af4a653d56fcaf59e90399beb2c355762140.zip
Diffstat (limited to 'src/video_core/pica.h')
-rw-r--r--src/video_core/pica.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/video_core/pica.h b/src/video_core/pica.h
index 1fac9ff36..89d97e4e9 100644
--- a/src/video_core/pica.h
+++ b/src/video_core/pica.h
@@ -201,9 +201,9 @@ struct Regs {
};
const std::array<FullTextureConfig, 3> GetTextures() const {
return {{
- { static_cast<bool>(texture0_enable), texture0, texture0_format },
- { static_cast<bool>(texture1_enable), texture1, texture1_format },
- { static_cast<bool>(texture2_enable), texture2, texture2_format }
+ { texture0_enable.ToBool(), texture0, texture0_format },
+ { texture1_enable.ToBool(), texture1, texture1_format },
+ { texture2_enable.ToBool(), texture2, texture2_format }
}};
}
@@ -590,11 +590,11 @@ struct Regs {
static std::string GetCommandName(int index) {
std::map<u32, std::string> map;
- Regs regs;
#define ADD_FIELD(name) \
do { \
map.insert({PICA_REG_INDEX(name), #name}); \
- for (u32 i = PICA_REG_INDEX(name) + 1; i < PICA_REG_INDEX(name) + sizeof(regs.name) / 4; ++i) \
+ /* TODO: change to Regs::name when VS2015 and other compilers support it */ \
+ for (u32 i = PICA_REG_INDEX(name) + 1; i < PICA_REG_INDEX(name) + sizeof(Regs().name) / 4; ++i) \
map.insert({i, #name + std::string("+") + std::to_string(i-PICA_REG_INDEX(name))}); \
} while(false)