From 3bb8625872e4b996977b27d2e513792121f9aff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Wed, 14 Nov 2018 20:01:36 -0800
Subject: [PATCH] Cleanup.

---
 makefile             | 39 ---------------------------------------
 src/image.cpp        |  6 +++---
 src/image_encode.cpp |  2 +-
 3 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/makefile b/makefile
index d6491a1..cd11a89 100644
--- a/makefile
+++ b/makefile
@@ -39,9 +39,6 @@ clean: ## Clean all intermediate files.
 	@mkdir .build
 
 projgen: ## Generate project files for all configurations.
-	$(GENIE) --with-tools                     vs2012
-	$(GENIE) --with-tools                     vs2013
-	$(GENIE) --with-tools                     vs2015
 	$(GENIE) --with-tools                     vs2017
 	$(GENIE) --with-tools --gcc=mingw-gcc     gmake
 	$(GENIE) --with-tools --gcc=linux-gcc     gmake
@@ -135,42 +132,6 @@ mingw-clang-release64: .build/projects/gmake-mingw-clang ## Build - MinGW Clang
 	$(MAKE) -R -C .build/projects/gmake-mingw-clang config=release64
 mingw-clang: mingw-clang-debug32 mingw-clang-release32 mingw-clang-debug64 mingw-clang-release64 ## Build - MinGW Clang x86/x64 Debug and Release
 
-.build/projects/vs2012:
-	$(GENIE) --with-tools vs2012
-vs2012-debug32: .build/projects/vs2012 ## Build - VS2012 x86 Debug
-	devenv .build/projects/vs2012/bimg.sln /Build "Debug|Win32"
-vs2012-release32: .build/projects/vs2012 ## Build - VS2012 x86 Release
-	devenv .build/projects/vs2012/bimg.sln /Build "Release|Win32"
-vs2012-debug64: .build/projects/vs2012 ## Build - VS2012 x64 Debug
-	devenv .build/projects/vs2012/bimg.sln /Build "Debug|x64"
-vs2012-release64: .build/projects/vs2012 ## Build - VS2012 x64 Release
-	devenv .build/projects/vs2012/bimg.sln /Build "Release|x64"
-vs2012: vs2012-debug32 vs2012-release32 vs2012-debug64 vs2012-release64 ## Build - VS2012 x86/x64 Debug and Release
-
-.build/projects/vs2013:
-	$(GENIE) --with-tools vs2013
-vs2013-debug32: .build/projects/vs2013 ## Build - VS2013 x86 Debug
-	devenv .build/projects/vs2013/bimg.sln /Build "Debug|Win32"
-vs2013-release32: .build/projects/vs2013 ## Build - VS2013 x86 Release
-	devenv .build/projects/vs2013/bimg.sln /Build "Release|Win32"
-vs2013-debug64: .build/projects/vs2013 ## Build - VS2013 x64 Debug
-	devenv .build/projects/vs2013/bimg.sln /Build "Debug|x64"
-vs2013-release64: .build/projects/vs2013 ## Build - VS2013 x64 Release
-	devenv .build/projects/vs2013/bimg.sln /Build "Release|x64"
-vs2013: vs2013-debug32 vs2013-release32 vs2013-debug64 vs2013-release64 ## Build - VS2013 x86/x64 Debug and Release
-
-.build/projects/vs2015:
-	$(GENIE) --with-tools vs2015
-vs2015-debug32: .build/projects/vs2015 ## Build - VS2015 x86 Debug
-	devenv .build/projects/vs2015/bimg.sln /Build "Debug|Win32"
-vs2015-release32: .build/projects/vs2015 ## Build - VS2015 x86 Release
-	devenv .build/projects/vs2015/bimg.sln /Build "Release|Win32"
-vs2015-debug64: .build/projects/vs2015 ## Build - VS2015 x64 Debug
-	devenv .build/projects/vs2015/bimg.sln /Build "Debug|x64"
-vs2015-release64: .build/projects/vs2015 ## Build - VS2015 x64 Release
-	devenv .build/projects/vs2015/bimg.sln /Build "Release|x64"
-vs2015: vs2015-debug32 vs2015-release32 vs2015-debug64 vs2015-release64 ## Build - VS2015 x86/x64 Debug and Release
-
 .build/projects/vs2017:
 	$(GENIE) --with-tools vs2017
 vs2017-debug32: .build/projects/vs2017 ## Build - vs2017 x86 Debug
diff --git a/src/image.cpp b/src/image.cpp
index 564254c..a7701e0 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -2429,9 +2429,9 @@ namespace bimg
 
 				switch (rotationMode)
 				{
-				case 1: bx::xchg(aa, rr); break;
-				case 2: bx::xchg(aa, gg); break;
-				case 3: bx::xchg(aa, bb); break;
+				case 1: bx::swap(aa, rr); break;
+				case 2: bx::swap(aa, gg); break;
+				case 3: bx::swap(aa, bb); break;
 				default:                  break;
 				};
 
diff --git a/src/image_encode.cpp b/src/image_encode.cpp
index 13da73b..09586fe 100644
--- a/src/image_encode.cpp
+++ b/src/image_encode.cpp
@@ -98,7 +98,7 @@ namespace bimg
 							for (uint32_t ii = 0; ii < 16; ++ii)
 							{ // BGRx
 								bx::memCopy(&block[ii*4], &ptr[(ii%4)*srcPitch + (ii&~3)], 4);
-								bx::xchg(block[ii*4+0], block[ii*4+2]);
+								bx::swap(block[ii*4+0], block[ii*4+2]);
 							}
 
 							*dstBlock++ = ProcessRGB_ETC2(block);