Commit ae461fc3 authored by Sam Lantinga's avatar Sam Lantinga

Fixed a few compiler warnings.

Added SDL_blit_copy.c to the Visual C++ project

The SSE and MMX intrinsics don't compile on Visual Studio yet...

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402612
parent 5d8720fd
...@@ -416,6 +416,14 @@ ...@@ -416,6 +416,14 @@
RelativePath="..\..\src\video\SDL_blit_A.c" RelativePath="..\..\src\video\SDL_blit_A.c"
> >
</File> </File>
<File
RelativePath="..\..\src\video\SDL_blit_copy.c"
>
</File>
<File
RelativePath="..\..\src\video\SDL_blit_copy.h"
>
</File>
<File <File
RelativePath="..\..\src\video\SDL_blit_N.c" RelativePath="..\..\src\video\SDL_blit_N.c"
> >
......
...@@ -139,10 +139,11 @@ SDL_ChooseBlitFunc(SDL_BlitEntry * entries, int count) ...@@ -139,10 +139,11 @@ SDL_ChooseBlitFunc(SDL_BlitEntry * entries, int count)
static Uint32 features = 0xffffffff; static Uint32 features = 0xffffffff;
if (features == 0xffffffff) { if (features == 0xffffffff) {
const char *override = SDL_getenv("SDL_BLIT_FEATURES");
features = SDL_BLIT_ANY; features = SDL_BLIT_ANY;
/* Provide an override for testing .. */ /* Allow an override for testing .. */
const char *override = SDL_getenv("SDL_BLIT_FEATURES");
if (override) { if (override) {
SDL_sscanf(override, "%u", &features); SDL_sscanf(override, "%u", &features);
} else { } else {
...@@ -152,7 +153,7 @@ SDL_ChooseBlitFunc(SDL_BlitEntry * entries, int count) ...@@ -152,7 +153,7 @@ SDL_ChooseBlitFunc(SDL_BlitEntry * entries, int count)
if (SDL_HasSSE()) { if (SDL_HasSSE()) {
features |= SDL_BLIT_SSE; features |= SDL_BLIT_SSE;
} }
if (SDL_HasAltivec()) { if (SDL_HasAltiVec()) {
if (SDL_UseAltivecPrefetch()) { if (SDL_UseAltivecPrefetch()) {
features |= SDL_BLIT_ALTIVEC_PREFETCH; features |= SDL_BLIT_ALTIVEC_PREFETCH;
} else { } else {
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <xmmintrin.h> #include <xmmintrin.h>
#endif #endif
#include "SDL_cpuinfo.h"
#include "SDL_endian.h" #include "SDL_endian.h"
/* The structure passed to the low level blit functions */ /* The structure passed to the low level blit functions */
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
*/ */
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL_cpuinfo.h"
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_blit.h" #include "SDL_blit.h"
#include "SDL_blit_copy.h" #include "SDL_blit_copy.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment