cmake: add support for Intel compiler [SDL2] #7520
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It reroutes intrinsic _byteswap_u(short|long|int64) call to libc function.
The /Gs argument controls the number of bytes that local variables can occupy before a stack probe is initiated. By setting it to a huge value, no calls to __chkstk are inserted. This change is needed for the classic Intel C compiler to build SDL with -DSDL_LIBC=OFF.
The classic Intel Compiler does not clear the ecx register prior to executing the cpuid opcode.
Fixes this warning: warning: comparison with infinity always evaluates to false in fast floating point modes [-Wtautological-constant-compare]
The new Intel LLVM library needs this because when building SDL2 in release mode.
The classic Intel compiler generates calls to these functions when building the SDL library with SDL_LIBC=OFF.
SDL_BlitCopyMMX ends with _mm_empty(), so the MMX state should be emptied. (_mm_empty is the intrinsic function for emms)
|
Are |
|
Yes it is. That's an oversight. Thanks for noticing! |
|
What else is left for this -- and for the SDL3 version? Are all the differences between the two resolved? |
|
Both branches build with both classic and llvm intel compilers on Linux and Windows. e.g. at this location, the following warning appears: But when I expand it, Expansion of ` FILLRECT(Uint32, DRAW_SETPIXEL_MUL_RGBA)`:Declared in: SDL_draw.h Definition:
#define FILLRECT(type, op) \
do { \
int width = rect->w; \
int height = rect->h; \
int pitch = (dst->pitch / dst->format->BytesPerPixel); \
int skip = pitch - width; \
type *pixel = (type *)dst->pixels + rect->y * pitch + rect->x; \
while (height--) { \
{ \
int n = (width + 3) / 4; \
switch (width & 3) { \
case 0: \
do { \
op; \
pixel++; \
SDL_FALLTHROUGH; \
case 3: \
op; \
pixel++; \
SDL_FALLTHROUGH; \
case 2: \
op; \
pixel++; \
SDL_FALLTHROUGH; \
case 1: \
op; \
pixel++; \
} while (--n > 0); \
} \
} \
pixel += skip; \
} \
} while (0)
Replacement:
do {
int width = rect->w;
int height = rect->h;
int pitch = (dst->pitch / dst->format->BytesPerPixel);
int skip = pitch - width;
Uint32 *pixel = (Uint32 *)dst->pixels + rect->y * pitch + rect->x;
while (height--) {
{
int n = (width + 3) / 4;
switch (width & 3) {
case 0:
do {
do {
unsigned sr, sg, sb, sa;
(void)sa;
{
sr = SDL_expand_byte[fmt->Rloss][((*pixel & fmt->Rmask) >> fmt->Rshift)];
sg = SDL_expand_byte[fmt->Gloss][((*pixel & fmt->Gmask) >> fmt->Gshift)];
sb = SDL_expand_byte[fmt->Bloss][((*pixel & fmt->Bmask) >> fmt->Bshift)];
sa = SDL_expand_byte[fmt->Aloss][((*pixel & fmt->Amask) >> fmt->Ashift)];
};
sr = (((unsigned)(sr) * (r)) / 255) + (((unsigned)(inva) * (sr)) / 255);
if (sr > 0xff)
sr = 0xff;
sg = (((unsigned)(sg) * (g)) / 255) + (((unsigned)(inva) * (sg)) / 255);
if (sg > 0xff)
sg = 0xff;
sb = (((unsigned)(sb) * (b)) / 255) + (((unsigned)(inva) * (sb)) / 255);
if (sb > 0xff)
sb = 0xff;
{
*pixel = ((sr >> fmt->Rloss) << fmt->Rshift) | ((sg >> fmt->Gloss) << fmt->Gshift) | ((sb >> fmt->Bloss) << fmt->Bshift) | ((sa >> fmt->Aloss) << fmt->Ashift);
};
} while (0);
pixel++;
SDL_FALLTHROUGH;
case 3:
do {
unsigned sr, sg, sb, sa;
(void)sa;
{
sr = SDL_expand_byte[fmt->Rloss][((*pixel & fmt->Rmask) >> fmt->Rshift)];
sg = SDL_expand_byte[fmt->Gloss][((*pixel & fmt->Gmask) >> fmt->Gshift)];
sb = SDL_expand_byte[fmt->Bloss][((*pixel & fmt->Bmask) >> fmt->Bshift)];
sa = SDL_expand_byte[fmt->Aloss][((*pixel & fmt->Amask) >> fmt->Ashift)];
};
sr = (((unsigned)(sr) * (r)) / 255) + (((unsigned)(inva) * (sr)) / 255);
if (sr > 0xff)
sr = 0xff;
sg = (((unsigned)(sg) * (g)) / 255) + (((unsigned)(inva) * (sg)) / 255);
if (sg > 0xff)
sg = 0xff;
sb = (((unsigned)(sb) * (b)) / 255) + (((unsigned)(inva) * (sb)) / 255);
if (sb > 0xff)
sb = 0xff;
{
*pixel = ((sr >> fmt->Rloss) << fmt->Rshift) | ((sg >> fmt->Gloss) << fmt->Gshift) | ((sb >> fmt->Bloss) << fmt->Bshift) | ((sa >> fmt->Aloss) << fmt->Ashift);
};
} while (0);
pixel++;
SDL_FALLTHROUGH;
case 2:
do {
unsigned sr, sg, sb, sa;
(void)sa;
{
sr = SDL_expand_byte[fmt->Rloss][((*pixel & fmt->Rmask) >> fmt->Rshift)];
sg = SDL_expand_byte[fmt->Gloss][((*pixel & fmt->Gmask) >> fmt->Gshift)];
sb = SDL_expand_byte[fmt->Bloss][((*pixel & fmt->Bmask) >> fmt->Bshift)];
sa = SDL_expand_byte[fmt->Aloss][((*pixel & fmt->Amask) >> fmt->Ashift)];
};
sr = (((unsigned)(sr) * (r)) / 255) + (((unsigned)(inva) * (sr)) / 255);
if (sr > 0xff)
sr = 0xff;
sg = (((unsigned)(sg) * (g)) / 255) + (((unsigned)(inva) * (sg)) / 255);
if (sg > 0xff)
sg = 0xff;
sb = (((unsigned)(sb) * (b)) / 255) + (((unsigned)(inva) * (sb)) / 255);
if (sb > 0xff)
sb = 0xff;
{
*pixel = ((sr >> fmt->Rloss) << fmt->Rshift) | ((sg >> fmt->Gloss) << fmt->Gshift) | ((sb >> fmt->Bloss) << fmt->Bshift) | ((sa >> fmt->Aloss) << fmt->Ashift);
};
} while (0);
pixel++;
SDL_FALLTHROUGH;
case 1:
do {
unsigned sr, sg, sb, sa;
(void)sa;
{
sr = SDL_expand_byte[fmt->Rloss][((*pixel & fmt->Rmask) >> fmt->Rshift)];
sg = SDL_expand_byte[fmt->Gloss][((*pixel & fmt->Gmask) >> fmt->Gshift)];
sb = SDL_expand_byte[fmt->Bloss][((*pixel & fmt->Bmask) >> fmt->Bshift)];
sa = SDL_expand_byte[fmt->Aloss][((*pixel & fmt->Amask) >> fmt->Ashift)];
};
sr = (((unsigned)(sr) * (r)) / 255) + (((unsigned)(inva) * (sr)) / 255);
if (sr > 0xff)
sr = 0xff;
sg = (((unsigned)(sg) * (g)) / 255) + (((unsigned)(inva) * (sg)) / 255);
if (sg > 0xff)
sg = 0xff;
sb = (((unsigned)(sb) * (b)) / 255) + (((unsigned)(inva) * (sb)) / 255);
if (sb > 0xff)
sb = 0xff;
{
*pixel = ((sr >> fmt->Rloss) << fmt->Rshift) | ((sg >> fmt->Gloss) << fmt->Gshift) | ((sb >> fmt->Bloss) << fmt->Bshift) | ((sa >> fmt->Aloss) << fmt->Ashift);
};
} while (0);
pixel++;
} while (--n > 0);
}
}
pixel += skip;
}
} while (0)It also keeps emitting the EMMS warning, that got fixed in the latest commit. |
I think it's emitting a false warning because of |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the SDL2 equivalent of #7516 (minus the intrinsics patches).
With these patches, SDL3 can be built on Linux and Windows using both the classic and new LLVM-based toolchain.