Mirrors/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-02-17 20:52:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-11-14 20:01:36 -08:00
parent 6cdb101cf8
commit 3bb8625872
3 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
makefile
View File

@@ -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

6
src/image.cpp
View File

@@ -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;
};

2
src/image_encode.cpp
View File

@@ -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);