forked from Green-Sky/tomato
sdl (master post 3.1 preview) Merge commit 'e4f454091a943345938608570b104400f62fd625'
This commit is contained in:
9
external/sdl/SDL/test/gamepadutils.c
vendored
9
external/sdl/SDL/test/gamepadutils.c
vendored
@@ -135,9 +135,9 @@ static SDL_Texture *CreateTexture(SDL_Renderer *renderer, unsigned char *data, u
|
||||
{
|
||||
SDL_Texture *texture = NULL;
|
||||
SDL_Surface *surface;
|
||||
SDL_RWops *src = SDL_RWFromConstMem(data, len);
|
||||
SDL_IOStream *src = SDL_IOFromConstMem(data, len);
|
||||
if (src) {
|
||||
surface = SDL_LoadBMP_RW(src, SDL_TRUE);
|
||||
surface = SDL_LoadBMP_IO(src, SDL_TRUE);
|
||||
if (surface) {
|
||||
texture = SDL_CreateTextureFromSurface(renderer, surface);
|
||||
SDL_DestroySurface(surface);
|
||||
@@ -649,6 +649,11 @@ static const char *gamepad_button_names[] = {
|
||||
"Right Paddle 2",
|
||||
"Left Paddle 2",
|
||||
"Touchpad",
|
||||
"Misc2",
|
||||
"Misc3",
|
||||
"Misc4",
|
||||
"Misc5",
|
||||
"Misc6",
|
||||
};
|
||||
SDL_COMPILE_TIME_ASSERT(gamepad_button_names, SDL_arraysize(gamepad_button_names) == SDL_GAMEPAD_BUTTON_MAX);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user