yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge two x86/x64 tests into one; update credits

Browse Source
This commit is contained in:
Sean Barrett 2015-04-12 09:30:05 -07:00
parent c8852111cc
commit e5fde30800
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stb_image.h
View File

@ -200,6 +200,7 @@
Engin Manap Engin Manap
Martins Mozeiko Martins Mozeiko
Joseph Thomson Joseph Thomson
Phil Jordan
License: License:
This software is in the public domain. Where that dedication is not This software is in the public domain. Where that dedication is not
@ -630,7 +631,11 @@ typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1];
#define STBI_FREE(p) free(p) #define STBI_FREE(p) free(p)
#endif #endif
#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386)) && !defined(__SSE2__) && !defined(STBI_NO_SIMD) #if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
#define STBI__X86
#endif
#if defined(__GNUC__) && defined(STBI__X86) && !defined(__SSE2__) && !defined(STBI_NO_SIMD)
// gcc doesn't support sse2 intrinsics unless you compile with -msse2, // gcc doesn't support sse2 intrinsics unless you compile with -msse2,
// (but compiling with -msse2 allows the compiler to use SSE2 everywhere; // (but compiling with -msse2 allows the compiler to use SSE2 everywhere;
// this is just broken and gcc are jerks for not fixing it properly // this is just broken and gcc are jerks for not fixing it properly
@ -638,7 +643,7 @@ typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1];
#define STBI_NO_SIMD #define STBI_NO_SIMD
#endif #endif
#if !defined(STBI_NO_SIMD) && (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)) #if !defined(STBI_NO_SIMD) && defined(STBI__X86)
#define STBI_SSE2 #define STBI_SSE2
#include <emmintrin.h> #include <emmintrin.h>