drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge changes from The Witness.

Browse Source
This commit is contained in:
Ignacio
2018-02-05 18:55:07 -08:00
parent 2075d740c9
commit 9489aed825
88 changed files with 8924 additions and 5025 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extern/poshlib/posh.h vendored
View File

@ -349,9 +349,18 @@ LLVM:
# define POSH_OS_STRING "UNICOS"
#endif
#if ( defined __MWERKS__ && defined __powerc && !defined macintosh ) || defined __APPLE_CC__ || defined macosx
# define POSH_OS_OSX 1
# define POSH_OS_STRING "MacOS X"
//ACS if we're in xcode, look at the target conditionals to figure out if this is ios or osx
#if defined __APPLE__
# include "TargetConditionals.h"
#endif
#if TARGET_OS_IPHONE
# define POSH_OS_IOS 1
# define POSH_OS_STRING "iOS"
#else
# if ( defined __MWERKS__ && defined __powerc && !defined macintosh ) || defined __APPLE_CC__ || defined macosx
# define POSH_OS_OSX 1
# define POSH_OS_STRING "MacOS X"
# endif
#endif
#if defined __sun__ || defined sun || defined __sun || defined __solaris__

6
extern/rg_etc1_v104/rg_etc1.cpp vendored
View File

@ -1808,7 +1808,7 @@ typedef unsigned long uint64;
{
if (block_inten[0] > m_pSorted_luma[n - 1])
{
const uint min_error = labs(int(block_inten[0] - m_pSorted_luma[n - 1]));
const uint min_error = abs(int(block_inten[0] - m_pSorted_luma[n - 1]));
if (min_error >= trial_solution.m_error)
continue;
}
@ -1822,7 +1822,7 @@ typedef unsigned long uint64;
{
if (m_pSorted_luma[0] > block_inten[3])
{
const uint min_error = labs(int(m_pSorted_luma[0] - block_inten[3]));
const uint min_error = abs(int(m_pSorted_luma[0] - block_inten[3]));
if (min_error >= trial_solution.m_error)
continue;
}
@ -1914,7 +1914,7 @@ done:
for (uint packed_c = 0; packed_c < limit; packed_c++)
{
int v = etc1_decode_value(diff, inten, selector, packed_c);
uint err = labs(v - static_cast<int>(color));
uint err = abs(v - static_cast<int>(color));
if (err < best_error)
{
best_error = err;