pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automated merge with https://bitbucket.org/Markusk/sdl-gsoc

Browse source
This commit is contained in:
Ryan C. Gordon 2011-08-29 13:17:07 -04:00
commit d2587c649d
112 changed files with 2994 additions and 52760 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/testmultiaudio.c
View file

@ -10,6 +10,7 @@
freely.
*/
#include "SDL.h"
#include <stdio.h>
static SDL_AudioSpec spec;
static Uint8 *sound = NULL; /* Pointer to wave data */

5
test/testplatform.c
View file

@ -123,8 +123,9 @@ TestEndian(SDL_bool verbose)
printf("Value 64 = 0x%I64X, swapped = 0x%I64X\n", value64,
SDL_Swap64(value64));
#else
printf("Value 64 = 0x%llX, swapped = 0x%llX\n", value64,
SDL_Swap64(value64));
printf("Value 64 = 0x%llX, swapped = 0x%llX\n",
(unsigned long long) value64,
(unsigned long long) SDL_Swap64(value64));
#endif
}
if (SDL_Swap64(value64) != swapped64) {

8
test/testshader.c
View file

@ -29,9 +29,9 @@ enum {
};
typedef struct {
GLuint program;
GLuint vert_shader;
GLuint frag_shader;
GLhandleARB program;
GLhandleARB vert_shader;
GLhandleARB frag_shader;
const char *vert_source;
const char *frag_source;
} ShaderData;
@ -124,7 +124,7 @@ static PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
static PFNGLUNIFORM1IARBPROC glUniform1iARB;
static PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
static SDL_bool CompileShader(GLenum shader, const char *source)
static SDL_bool CompileShader(GLhandleARB shader, const char *source)
{
GLint status;