From 2081ed7db22d62b82acfddcd4b7c10a03bb3daaf Mon Sep 17 00:00:00 2001 From: Markus Wick Date: Tue, 4 Sep 2018 13:54:50 +0200 Subject: command_processor: Use std::array for bound_engines. subchannel is a 3 bit field. So there must not be more than 8 bound engines. And using a hashmap for up to 8 values is a bit overpowered. --- src/video_core/command_processor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/video_core/command_processor.cpp') diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index dc485e811..d5831e752 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp @@ -34,6 +34,8 @@ void GPU::WriteReg(u32 method, u32 subchannel, u32 value, u32 remaining_params) "{:08X} remaining params {}", method, subchannel, value, remaining_params); + ASSERT(subchannel < bound_engines.size()); + if (method == static_cast(BufferMethods::BindObject)) { // Bind the current subchannel to the desired engine id. LOG_DEBUG(HW_GPU, "Binding subchannel {} to engine {}", subchannel, value); @@ -47,8 +49,6 @@ void GPU::WriteReg(u32 method, u32 subchannel, u32 value, u32 remaining_params) return; } - ASSERT(bound_engines.find(subchannel) != bound_engines.end()); - const EngineID engine = bound_engines[subchannel]; switch (engine) { -- cgit v1.2.3