soreau / sdl Goto Github PK

Some applications, like xbmc depend on the video backend to handle mouse cursors (namely, hiding them and setting custom ones). Without it they crash. It should be possible to support this in the wayland backend.

Hey, Scott, we're looking to merge this into mainline SDL now. The guy that's merging it pointed out that there are LGPL headers on several files...they look like copy/pastes of headers that were on SDL 1.2, so it might not be a big deal, but we can't put this into SDL2 with those license headers. Would you mind if we removed them, so they fall under the zlib license with the rest of SDL2?

SDL2_image 2.0.0 doesn't build against this since the source is now months old. Could you please update it ?

I tried to merge changes from https://github.com/spurious/SDL-mirror but commits are not matching :(

I was able to build darkplaces engine r11979 and run xonotic with it using this patch:

diff --git a/makefile.inc b/makefile.inc
index 72d1856..68f4bfa 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -25,13 +25,13 @@ CC?=gcc
 CPUOPTIMIZATIONS?=-fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math
 # NOTE: *never* *ever* use the -ffast-math or -funsafe-math-optimizations flag

-SDL_CONFIG?=sdl-config
+SDL_CONFIG?=sdl2-config
 SDLCONFIG_UNIXCFLAGS?=`$(SDL_CONFIG) --cflags`
 SDLCONFIG_UNIXCFLAGS_X11?=
 SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs`
-SDLCONFIG_UNIXLIBS_X11?=-lX11
+SDLCONFIG_UNIXLIBS_X11?=-lGLESv2
 SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs`
-SDLCONFIG_UNIXSTATICLIBS_X11?=-lX11
+SDLCONFIG_UNIXSTATICLIBS_X11?=-lGLESv2
 SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL.framework/Headers -I$(HOME)/Library/Frameworks/SDL.framework/Headers
 SDLCONFIG_MACOSXLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
 SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
@@ -171,7 +171,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_SND_COMMON) snd_sdl.


 # Compilation
-CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES
+CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_D3D) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -DUSE_GLES2 -I/usr/include/SDL2 -D_REENTRANT
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb -fprofile-arcs
 CFLAGS_RELEASE=

Used kernel-3.9.9+mesa-9.1.4(r600g)+wayland-1.2.0+weston-1.2.0, xonotic works, but mouse is almost not usable and when i tried making screenshots, switching screens and windows i got black screen and was forced to reboot.
Not sure if it is libsdl2, mesa, wayland, kernel or darkplaces bug, but please try building and testing it.

P.S. screenshots:
http://i.imgur.com/cXphkzX.jpg
http://i.imgur.com/1Lw5dpM.jpg

SDL video backends have a GetSysWMInfo hook to expose window system specific structures to clients that might want to use them. We should expose the following in case clients want to use functionality which SDL does not provide a suitable abstraction for, eg:

• wl_display
• wl_shell_surface

Currently PumpEvents polls the fd to see if there is any more data to be read without blocking. If there is it calls _dispatch (), if not, it calls _dispatch_pending ().

However, there is a possible condition where new events in the output buffer might need to be sent to the compositor in order to get back the events that we need to continue. In that case, we really need to dispatch pending events, cause any new requests to be buffered up, flush the buffer and then poll, so that we'll know if we need to read any more events in. Otherwise they might come a little bit late.

Currently, the SDL backend just creates a GL-api EGLContext. We should use EGL_OPENGL_ES_API when in OpenGL|ES mode.

Current cmake build system does not know about wayland, please update it.