diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-08-23 08:25:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-23 08:25:33 +0200 |
| commit | 24e919a26c39e76fdd3c66b8faf0847f322cf208 (patch) | |
| tree | 0078c0a14008c1fc48176c9489d7e20dd4222997 /Source/Core/VideoBackends/Software/TransformUnit.cpp | |
| parent | c12418788a29dc54e4e98b12e2acf6bc93020e5d (diff) | |
| parent | bc57ab39231b9a6d9b5f1c31b520cdee9716d6df (diff) | |
Merge pull request #5944 from lioncash/sw
SW NativeVertexFormat: Utilize std::array where applicable
Diffstat (limited to 'Source/Core/VideoBackends/Software/TransformUnit.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/TransformUnit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/Software/TransformUnit.cpp b/Source/Core/VideoBackends/Software/TransformUnit.cpp index 0b1d28c27b..e9196798fc 100644 --- a/Source/Core/VideoBackends/Software/TransformUnit.cpp +++ b/Source/Core/VideoBackends/Software/TransformUnit.cpp @@ -330,7 +330,7 @@ void TransformColor(const InputVertexData* src, OutputVertexData* dst) // color const LitChannel& colorchan = xfmem.color[chan]; if (colorchan.matsource) - std::memcpy(matcolor.data(), src->color[chan], sizeof(u32)); // vertex + matcolor = src->color[chan]; // vertex else std::memcpy(matcolor.data(), &xfmem.matColor[chan], sizeof(u32)); @@ -403,7 +403,7 @@ void TransformColor(const InputVertexData* src, OutputVertexData* dst) // abgr -> rgba const u32 rgba_color = Common::swap32(chancolor.data()); - std::memcpy(dst->color[chan], &rgba_color, sizeof(u32)); + std::memcpy(dst->color[chan].data(), &rgba_color, sizeof(u32)); } } |
