| Revisión | b8c63935328fde3a5acf68225f3ed5c890396d02 (tree) |
|---|---|
| Tiempo | 2019-03-19 20:56:05 |
| Autor | Nicolas Capens <capn@goog...> |
| Commiter | Nicolas Capens |
Use C++11 std::swap()
Bug b/126126820
Change-Id: Iaf3991d58c64995018ba0d15773b65d463e03fad
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27549
Reviewed-by: Ben Clayton <bclayton@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
src/Device/Blitter.cpp (diff) src/System/Math.hpp (diff)| @@ -20,6 +20,8 @@ | ||
| 20 | 20 | #include "Vulkan/VkDebug.hpp" |
| 21 | 21 | #include "Vulkan/VkImage.hpp" |
| 22 | 22 | |
| 23 | +#include <utility> | |
| 24 | + | |
| 23 | 25 | namespace sw |
| 24 | 26 | { |
| 25 | 27 | Blitter::Blitter() |
| @@ -1523,14 +1525,14 @@ namespace sw | ||
| 1523 | 1525 | |
| 1524 | 1526 | if(region.dstOffsets[0].x > region.dstOffsets[1].x) |
| 1525 | 1527 | { |
| 1526 | - swap(region.srcOffsets[0].x, region.srcOffsets[1].x); | |
| 1527 | - swap(region.dstOffsets[0].x, region.dstOffsets[1].x); | |
| 1528 | + std::swap(region.srcOffsets[0].x, region.srcOffsets[1].x); | |
| 1529 | + std::swap(region.dstOffsets[0].x, region.dstOffsets[1].x); | |
| 1528 | 1530 | } |
| 1529 | 1531 | |
| 1530 | 1532 | if(region.dstOffsets[0].y > region.dstOffsets[1].y) |
| 1531 | 1533 | { |
| 1532 | - swap(region.srcOffsets[0].y, region.srcOffsets[1].y); | |
| 1533 | - swap(region.dstOffsets[0].y, region.dstOffsets[1].y); | |
| 1534 | + std::swap(region.srcOffsets[0].y, region.srcOffsets[1].y); | |
| 1535 | + std::swap(region.dstOffsets[0].y, region.dstOffsets[1].y); | |
| 1534 | 1536 | } |
| 1535 | 1537 | |
| 1536 | 1538 | VkExtent3D srcExtent = src->getMipLevelExtent(region.srcSubresource.mipLevel); |
| @@ -66,14 +66,6 @@ namespace sw | ||
| 66 | 66 | return min(min(a, b), min(c, d)); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - template<class T> | |
| 70 | - inline void swap(T &a, T &b) | |
| 71 | - { | |
| 72 | - T t = a; | |
| 73 | - a = b; | |
| 74 | - b = t; | |
| 75 | - } | |
| 76 | - | |
| 77 | 69 | template <typename destType, typename sourceType> |
| 78 | 70 | destType bit_cast(const sourceType &source) |
| 79 | 71 | { |
Android-x86
Fork