Commit graph

169 commits

Author SHA1 Message Date
Sam Lantinga af50403e50 Fixed bug 2575 - Current GL context tracking fails
Ronie Salgado

The GL Renderer current context tracking fails when one window is used with an SDL renderer but another separate window is used with a user handled OpenGL context.

Attached is a small program that reproduces this bug, at least in some Linux machines where an OpenGL renderer is provided by default.

Expected Output:
-"First window" should be blue.
-"Second window" should be green.

Gotten Output:
- "First window" black.
- "Second window" blue.

What happened:
The renderer created for the "first window" ends rendering into the "second window" OpenGL context.

Bug location:

SDL_render_gl.c - line 286 on hg:
static SDL_GLContext SDL_CurrentContext = NULL;

When making SDL_GL_MakeCurrent from the user perspective, that variable or the GL renderer is not notified about the OpenGL context change.

Solution proposal:
- Move the current GL context cache into another place global.
2014-06-15 18:09:39 -07:00
Sam Lantinga 175b343ee6 Fixed bug 2568 - NO_SDL_GLEXT should prevent OS glext.h as well
J?rgen Tjern?

If you #define NO_SDL_GLEXT before including SDL_opengl.h, it still includes the platform-provided glext.h. The comments indicate that this define is intended to be used when you provide your own glext.h (quote from SDL_opengl.h: "Define this if you have your own version of glext.h and want to disable the version included in SDL_opengl.h.")

This is a problem because glext.h depends on the contents of gl.h, and it's practical to let SDL_opengl.h pick the right #include for gl.h for our platform.
2014-06-15 17:37:35 -07:00
Sam Lantinga 2a082c07f6 Fixed bug 2580 - sndio backend improvements
Brad Smith

Attached is patch from the OpenBSD ports tree to add 24-bit support to the sndio backend and to make use of the sio_open() option SIO_DEVANY.
2014-06-15 17:26:30 -07:00
Sam Lantinga 6146fe85cc Fixed 2584 - Memory leak in Cocoa_GetDisplayName
Diego

The Xcode Instruments Leak tool reports a leak from IODisplayCreateInfoDictionary in Cocoa_GetDisplayName.
This happened after upgrading to Xcode 5.
2014-06-15 17:18:05 -07:00
Sam Lantinga 54771080f3 Add controller mapping for Bluetooth DualShock 4 controllers on Linux
Frank Praznik

Add a gamepad mapping entry for Bluetooth DualShock 4 controllers on Linux.
The button mapping is the same as the USB controller, but the GUID is
different.
2014-06-15 13:05:30 -07:00
Sam Lantinga b9d1f9edd8 Fixed Android error on static lib build, if relative NDK_MODULE_PATH used
Stefan P?schel

if the variable NDK_MODULE_PATH is set to a relative path (like "../"),
compiling of a static SDL lib fails with an error similar to this:
make: *** No rule to make target
`..//android_libs/SDL/..//android_libs/SDL/src/main/android/SDL_android_main.c',
needed by
`obj/local/armeabi/objs/SDL2_static/__//android_libs/SDL/src/main/android/SDL_android_main.o'.
 Stop.

Regarding the shared lib, this is already prevented by a "subst" command
in the /Android.mk, which removes all occurences of "$(LOCAL_PATH)/".
The attached patch does the same with the additional
"SDL_android_main.c", which is included for build the static SDL lib.
2014-06-15 13:01:10 -07:00
Sam Lantinga ab4f1aaae3 Fixed Visual Studio 2008 projects
Added missing files to SDL2 project
Added missing Visual Studio 2008 tests to the solution
Added output paths which match the 2010+ projects
Added SDL project references instead of old style project dependencies
Removed post-build copy step and added data files to projects
2014-06-15 10:42:28 -07:00
Ryan C. Gordon 39bad809c3 Mac: Fixed crash when returning from a fullscreen Space on shutdown. 2014-06-15 11:59:16 -04:00
Ryan C. Gordon 70cebc7d43 Add coreaudio to the configure script's summary output. 2014-06-15 01:19:01 -04:00
Ryan C. Gordon 446d19c4de Removed SDL_SYS_JoystickNeedsPolling().
It was simpler to just have the polling (actually: hotplug detection)
 functions return immediately if it's not an appropriate time to poll.

Note that previously, if any joystick/controller was opened, we would poll
 every time anyhow, skipping this function.
2014-06-14 23:31:23 -04:00
Ryan C. Gordon 9e5504f89d Mac: Run the CFRunLoop in joystick mode during SDL_SYS_JoystickNeedsPolling().
This fixes hotplugging failing to detect devices.
2014-06-13 14:52:26 -04:00
Alfred Reynolds 8c2c744ad5 - fixed crash if you removed a device twice, the deviceRef is invalid if removed from the removed device callback (added in http://hg.libsdl.org/SDL/rev/d4e4d0fcda03 ). 2014-06-13 10:50:24 -07:00
Ryan C. Gordon 8719a76535 Regenerated SDL_audiotypecvt.c with updated perl script. 2014-06-10 19:39:33 -04:00
Ryan C. Gordon 91b7fb00d0 Fix audio resampling in some cases.
Fixes Bugzilla #2389.
2014-06-10 19:37:59 -04:00
Philipp Wiesemann 78d40e0901 Fixed nesting of HTML elements in documentation.
The code element may only contain inline but the pre element is block.
2014-06-09 17:37:59 +02:00
Philipp Wiesemann f4df542580 Fixed typos in documentation. 2014-06-09 17:28:08 +02:00
Philipp Wiesemann ea93820e1f Fixed format string faults in audio tests.
They were found by the recent code annotations.
2014-06-09 17:25:03 +02:00
Gabriel Jacobo 7467e30b83 Forgot a piece of README-nacl.txt 2014-06-08 18:50:40 -03:00
Gabriel Jacobo efa2d0581d Fixes audio for Native Client, and other fixes...
- SDL_NaClMount, SDL_NaClUmount
- Default mounting of https at / in SDL's main function
- More documentation in README-nacl.txt
2014-06-08 18:18:13 -03:00
Sam Lantinga 5ae12b46b5 The NaCL mount/unmount functions need to be in SDL_system.h and specific to NaCL 2014-06-08 12:05:17 -07:00
Sam Lantinga be74705f82 Visual Studio 2013 Express Edition can load the standard solution, so we don't need special Express Edition solutions. 2014-06-08 12:00:29 -07:00
Sam Lantinga d639d031cf Ignore Visual Studio test data files 2014-06-08 11:59:36 -07:00
Philipp Wiesemann ef3887ecfc Changed two Java nested classes into static nested classes.
Both do not need an implicitly created reference to enclosing class.
2014-06-08 13:14:20 +02:00
Philipp Wiesemann d2220917e0 Fixed typo in log message. 2014-06-08 13:03:45 +02:00
Philipp Wiesemann 2b95c4c40b Fixed doxygen comment in header. 2014-06-08 13:01:04 +02:00
Philipp Wiesemann 0ad1dc1875 Fixed typo in source comment. 2014-06-08 12:51:02 +02:00
Sam Lantinga 85cae4783b Updated projects for Visual Studio 2010, 2012 and 2013
* Test programs use project references instead of hard-coding SDL library dependencies
* Test data files are copied only when needed.
* Copying SDL2.dll is no longer necessary
* Fixed /SAFESEH warning
* Fixed attempted rebuild of SDL every time a test program is run
2014-06-07 21:58:18 -07:00
Sam Lantinga 47e0aa0e6a Fixed building on command line Mac OS X 2014-06-07 20:43:12 -07:00
Sam Lantinga cde32ccc83 Fixed compile warnings 2014-06-07 18:20:25 -07:00
Sam Lantinga 6101e4b20e Added SDL_sqrtf(), SDL_tan(), SDL_tanf() 2014-06-07 18:20:01 -07:00
Sam Lantinga 40538446d9 Fixed crash with SDL_SetError(NULL) 2014-06-07 17:31:50 -07:00
Sam Lantinga 0ddd252fdd Fixed initializing test event queue 2014-06-07 17:25:56 -07:00
Sam Lantinga 5907cfaadf Fixed another loopwave crash with no command line arguments 2014-06-07 17:25:35 -07:00
Sam Lantinga a93474a2e5 Fixed loopwave crash with no command line arguments 2014-06-07 17:09:32 -07:00
Sam Lantinga 9fb2cc10c0 dront78 implemented YUV texture support for OpenGL ES 2.0 2014-06-07 11:36:08 -07:00
Gabriel Jacobo 93aabd3224 Adds missing Makefile for NACL test and a couple of smaller fixes 2014-06-06 18:33:17 -03:00
Gabriel Jacobo 1e352d7929 Chrome's Native Client backend implementation 2014-06-06 15:45:59 -03:00
Brandon Schaefer 04a0836b1a Turns out visualstudio does not like PRIu64, soo lets just cast it to llu. 2014-06-05 15:37:33 -07:00
Brandon Schaefer 1f71676906 Fix warnings, only major one being an SDL_SetError not providing enough arguments. 2014-06-05 15:29:23 -07:00
Sam Lantinga 6671aa2a08 Code analysis annotations found a legitimate bug! 2014-06-05 09:49:45 -07:00
Sam Lantinga d0146cfcc0 Added missing headers that should be installed. 2014-06-05 09:27:06 -07:00
Ryan C. Gordon 4f7329a127 Don't link directly against OpenGL.framework on Mac OS X.
We dlopen() it as appropriate already.
2014-06-05 11:04:07 -04:00
Ryan C. Gordon c294130f6e Added SDL_opengl_glext.h to the list of headers to install. 2014-06-05 10:28:08 -04:00
Ryan C. Gordon 3dedcf29ff Corrected package list for Wayland/Mir support (was missing libxkbcommon-dev). 2014-06-05 01:55:52 -04:00
Sam Lantinga 1188c174d7 Fixed Mac OS X build 2014-06-04 16:35:07 -07:00
Brandon Schaefer d829af786e Assume all motion events are mouse events unless tool_type states otherwise. 2014-06-04 12:55:18 -07:00
Sam Lantinga 4fd03b9582 Setting the window size changes the fullscreen display mode, unless a window display mode has been set.
Testing:
* Ran testsprite2 --fullscreen, used Ctrl+ and Ctrl- to change window sizes, verified that the display mode changed as well.
2014-06-04 10:57:52 -07:00
Sam Lantinga c15e26d77d Fixed crash and lost pixel data when recovering from a lost device situation (e.g. alt-tab from fullscreen) 2014-06-04 10:57:40 -07:00
Sam Lantinga 947a0b8bae Ryan C. Gordon <icculus@icculus.org> 2014-05-24 01:23 -0400
Generated dynapi stuff for the new WinRT entry points.
http://hg.libsdl.org/SDL/rev/d54306e2b8a7
2014-06-04 10:57:12 -07:00
Sam Lantinga da6d9a9f2a Added annotations to help code analysis tools
CR: Bruce Dawson
2014-06-04 10:56:56 -07:00