diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2016-02-11 17:41:15 +0000 | 
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2016-02-12 19:51:16 +0000 | 
| commit | 6c71858c5c698a718045ba44eda495080417a84b (patch) | |
| tree | 0dc7778532b0e2d1c5acd0224266b8a67d961155 /src/video_core | |
| parent | f1d1049c4fdf51fd382f9afb6b5cd5f104e71b0e (diff) | |
BitField: Make trivially copyable and remove assignment operator
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/command_processor.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 8 | 
2 files changed, 6 insertions, 6 deletions
| diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index 5dfedfe31..ed20057b5 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp @@ -429,7 +429,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {                            uniform.w.ToFloat32());                  // TODO: Verify that this actually modifies the register! -                uniform_setup.index = uniform_setup.index + 1; +                uniform_setup.index.Assign(uniform_setup.index + 1);              }              break;          } @@ -478,7 +478,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {              ASSERT_MSG(lut_config.index < 256, "lut_config.index exceeded maximum value of 255!");              g_state.lighting.luts[lut_config.type][lut_config.index].raw = value; -            lut_config.index = lut_config.index + 1; +            lut_config.index.Assign(lut_config.index + 1);              break;          } diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 4f66dbd65..6e6fd7335 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -201,11 +201,11 @@ void DumpShader(const std::string& filename, const Regs::ShaderConfig& config, c                      if (it == output_info_table.end()) {                          output_info_table.emplace_back(); -                        output_info_table.back().type = type; -                        output_info_table.back().component_mask = component_mask; -                        output_info_table.back().id = i; +                        output_info_table.back().type.Assign(type); +                        output_info_table.back().component_mask.Assign(component_mask); +                        output_info_table.back().id.Assign(i);                      } else { -                        it->component_mask = it->component_mask | component_mask; +                        it->component_mask.Assign(it->component_mask | component_mask);                      }                  } catch (const std::out_of_range& ) {                      DEBUG_ASSERT_MSG(false, "Unknown output attribute mapping"); | 
