Fixed creating a renderer on the dummy driver on Mac OS X
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
index 53ef9b3..57a26f7 100644
--- a/src/video/SDL_sysvideo.h
+++ b/src/video/SDL_sysvideo.h
@@ -288,6 +288,7 @@ struct SDL_VideoDevice
/* * * */
/* Data common to all drivers */
+ SDL_bool is_dummy;
SDL_bool suspend_screensaver;
int num_displays;
SDL_VideoDisplay *displays;
@@ -295,7 +296,7 @@ struct SDL_VideoDevice
SDL_Window *grabbed_window;
Uint8 window_magic;
Uint32 next_object_id;
- char * clipboard_text;
+ char *clipboard_text;
/* * * */
/* Data used by the GL drivers */
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 18d756a..230a3f4 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -172,6 +172,11 @@ ShouldUseTextureFramebuffer()
return SDL_TRUE;
}
+ /* If this is the dummy driver there is no texture support */
+ if (_this->is_dummy) {
+ return SDL_FALSE;
+ }
+
/* If the user has specified a software renderer we can't use a
texture framebuffer, or renderer creation will go recursive.
*/
@@ -1175,7 +1180,7 @@ SDL_UpdateFullscreenMode(SDL_Window * window, SDL_bool fullscreen)
if (window->is_destroying && (window->last_fullscreen_flags & FULLSCREEN_MASK) == SDL_WINDOW_FULLSCREEN_DESKTOP)
return 0;
- if (SDL_strcmp(_this->name, "dummy") != 0) {
+ if (!_this->is_dummy) {
/* If we're switching between a fullscreen Space and "normal" fullscreen, we need to get back to normal first. */
if (fullscreen && ((window->last_fullscreen_flags & FULLSCREEN_MASK) == SDL_WINDOW_FULLSCREEN_DESKTOP) && ((window->flags & FULLSCREEN_MASK) == SDL_WINDOW_FULLSCREEN)) {
if (!Cocoa_SetWindowFullscreenSpace(window, SDL_FALSE)) {
@@ -1369,7 +1374,7 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
/* Some platforms have OpenGL enabled by default */
#if (SDL_VIDEO_OPENGL && __MACOSX__) || __IPHONEOS__ || __ANDROID__ || __NACL__
- if (SDL_strcmp(_this->name, "dummy") != 0) {
+ if (!_this->is_dummy) {
flags |= SDL_WINDOW_OPENGL;
}
#endif
diff --git a/src/video/dummy/SDL_nullvideo.c b/src/video/dummy/SDL_nullvideo.c
index 96f4781..c419748 100644
--- a/src/video/dummy/SDL_nullvideo.c
+++ b/src/video/dummy/SDL_nullvideo.c
@@ -84,6 +84,7 @@ DUMMY_CreateDevice(int devindex)
SDL_OutOfMemory();
return (0);
}
+ device->is_dummy = SDL_TRUE;
/* Set the function pointers */
device->VideoInit = DUMMY_VideoInit;