removed QNX support.

configure

@@ -18125,14 +18125,7 @@ case "$host" in
 esac
 
 INCLUDE="-I$srcdir/include"
-
-case "$host" in
-    *-*-nto-qnx*)
-        ;;
-    *)
 INCLUDE="$INCLUDE -idirafter $srcdir/src/video/khronos"
-        ;;
-esac
 
 case "$host" in
     *-*-haiku*)
@@ -24507,32 +24500,6 @@ printf "%s\n" "#define SDL_VIDEO_DRIVER_OFFSCREEN 1" >>confdefs.h
     fi
 }
 
-CheckQNXVideo()
-{
-    if test x$enable_video = xyes; then
-
-printf "%s\n" "#define SDL_VIDEO_DRIVER_QNX 1" >>confdefs.h
-
-        SOURCES="$SOURCES $srcdir/src/video/qnx/*.c"
-        have_video=yes
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lscreen -lEGL -lGLESv2"
-        SUMMARY_video="${SUMMARY_video} qnx"
-    fi
-}
-
-CheckQNXAudio()
-{
-    if test x$enable_audio = xyes; then
-
-printf "%s\n" "#define SDL_AUDIO_DRIVER_QSA 1" >>confdefs.h
-
-        SOURCES="$SOURCES $srcdir/src/audio/qsa/*.c"
-        have_audio=yes
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound"
-        SUMMARY_audio="${SUMMARY_audio} qsa"
-    fi
-}
-
 # Check whether --enable-video-opengl was given.
 if test ${enable_video_opengl+y}
 then :
@@ -25727,10 +25694,6 @@ fi
             pthread_cflags="-D_REENTRANT"
             pthread_lib=""
             ;;
-        *-*-nto*)
-            pthread_cflags="-D_REENTRANT"
-            pthread_lib=""
-            ;;
         *-*-emscripten*)
             pthread_cflags="-D_REENTRANT -pthread"
             pthread_lib="-pthread"
@@ -27201,7 +27164,7 @@ CheckEventSignals
 have_locale=no
 
 case "$host" in
-    *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*|*-*-nto*)
+    *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*)
         case "$host" in
             *-*-android*)
                 # Android
@@ -27237,9 +27200,6 @@ printf "%s\n" "#define SDL_VIDEO_DRIVER_ANDROID 1" >>confdefs.h
             *-*-hpux*)          ARCH=hpux ;;
             *-*-aix*)           ARCH=aix ;;
             *-*-minix*)         ARCH=minix ;;
-            *-*-nto*)           ARCH=nto
-                CheckQNXVideo
-                ;;
         esac
         CheckVisibilityHidden
         CheckWerror
@@ -27337,9 +27297,6 @@ printf "%s\n" "#define SDL_AUDIO_DRIVER_AAUDIO 1" >>confdefs.h
 
                 have_audio=yes
             ;;
-            nto)
-                CheckQNXAudio
-            ;;
           esac
         fi
         # Set up files for the joystick library

configure.ac

@@ -88,15 +88,7 @@ esac
 
 dnl Set up the compiler and linker flags
 INCLUDE="-I$srcdir/include"
-
-dnl Don't use our khronos headers on QNX.
-case "$host" in
-    *-*-nto-qnx*)
-        ;;
-    *)
 INCLUDE="$INCLUDE -idirafter $srcdir/src/video/khronos"
-        ;;
-esac
 
 dnl use CXX for linker on Haiku
 case "$host" in
@@ -2162,30 +2154,6 @@ CheckOffscreenVideo()
     fi
 }
 
-dnl Set up the QNX video driver if enabled
-CheckQNXVideo()
-{
-    if test x$enable_video = xyes; then
-        AC_DEFINE(SDL_VIDEO_DRIVER_QNX, 1, [ ])
-        SOURCES="$SOURCES $srcdir/src/video/qnx/*.c"
-        have_video=yes
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lscreen -lEGL -lGLESv2"
-        SUMMARY_video="${SUMMARY_video} qnx"
-    fi
-}
-
-dnl Set up the QNX audio driver if enabled
-CheckQNXAudio()
-{
-    if test x$enable_audio = xyes; then
-        AC_DEFINE(SDL_AUDIO_DRIVER_QSA, 1, [ ])
-        SOURCES="$SOURCES $srcdir/src/audio/qsa/*.c"
-        have_audio=yes
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound"
-        SUMMARY_audio="${SUMMARY_audio} qsa"
-    fi
-}
-
 dnl Check to see if OpenGL support is desired
 AC_ARG_ENABLE(video-opengl,
 [AS_HELP_STRING([--enable-video-opengl], [include OpenGL support [default=yes]])],
@@ -2806,10 +2774,6 @@ dnl This is used on Linux for glibc binary compatibility (Doh!)
             pthread_cflags="-D_REENTRANT"
             pthread_lib=""
             ;;
-        *-*-nto*)
-            pthread_cflags="-D_REENTRANT"
-            pthread_lib=""
-            ;;
         *-*-emscripten*)
             pthread_cflags="-D_REENTRANT -pthread"
             pthread_lib="-pthread"
@@ -3436,7 +3400,7 @@ have_locale=no
 
 dnl Set up the configuration based on the host platform!
 case "$host" in
-    *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*|*-*-nto*)
+    *-*-linux*|*-*-uclinux*|*-*-gnu*|*-*-k*bsd*-gnu|*-*-bsdi*|*-*-freebsd*|*-*-dragonfly*|*-*-netbsd*|*-*-openbsd*|*-*-sysv5*|*-*-solaris*|*-*-hpux*|*-*-aix*|*-*-minix*)
         case "$host" in
             *-*-android*)
                 # Android
@@ -3470,9 +3434,6 @@ case "$host" in
             *-*-hpux*)          ARCH=hpux ;;
             *-*-aix*)           ARCH=aix ;;
             *-*-minix*)         ARCH=minix ;;
-            *-*-nto*)           ARCH=nto
-                CheckQNXVideo
-                ;;
         esac
         CheckVisibilityHidden
         CheckWerror
@@ -3562,9 +3523,6 @@ case "$host" in
 
                 have_audio=yes
             ;;
-            nto)
-                CheckQNXAudio
-            ;;
           esac
         fi
         # Set up files for the joystick library

include/SDL_atomic.h

@@ -200,11 +200,6 @@ extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void);
 typedef void (*SDL_KernelMemoryBarrierFunc)();
 #define SDL_MemoryBarrierRelease()	((SDL_KernelMemoryBarrierFunc)0xffff0fa0)()
 #define SDL_MemoryBarrierAcquire()	((SDL_KernelMemoryBarrierFunc)0xffff0fa0)()
-#elif 0 /* defined(__QNXNTO__) */
-#include <sys/cpuinline.h>
-
-#define SDL_MemoryBarrierRelease()   __cpu_membarrier()
-#define SDL_MemoryBarrierAcquire()   __cpu_membarrier()
 #else
 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) || defined(__ARM_ARCH_8A__)
 #define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("dmb ish" : : : "memory")

include/SDL_config.h.cmake

@@ -305,7 +305,6 @@
 #cmakedefine SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC @SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC@
 #cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO @SDL_AUDIO_DRIVER_PULSEAUDIO@
 #cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC @SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC@
-#cmakedefine SDL_AUDIO_DRIVER_QSA @SDL_AUDIO_DRIVER_QSA@
 #cmakedefine SDL_AUDIO_DRIVER_WASAPI @SDL_AUDIO_DRIVER_WASAPI@
 #cmakedefine SDL_AUDIO_DRIVER_VITA @SDL_AUDIO_DRIVER_VITA@
 #cmakedefine SDL_AUDIO_DRIVER_PSP @SDL_AUDIO_DRIVER_PSP@
@@ -394,7 +393,6 @@
 #cmakedefine SDL_VIDEO_DRIVER_RPI @SDL_VIDEO_DRIVER_RPI@
 #cmakedefine SDL_VIDEO_DRIVER_VIVANTE @SDL_VIDEO_DRIVER_VIVANTE@
 #cmakedefine SDL_VIDEO_DRIVER_VIVANTE_VDK @SDL_VIDEO_DRIVER_VIVANTE_VDK@
-#cmakedefine SDL_VIDEO_DRIVER_QNX @SDL_VIDEO_DRIVER_QNX@
 #cmakedefine SDL_VIDEO_DRIVER_RISCOS @SDL_VIDEO_DRIVER_RISCOS@
 #cmakedefine SDL_VIDEO_DRIVER_PSP @SDL_VIDEO_DRIVER_PSP@
 #cmakedefine SDL_VIDEO_DRIVER_PS2 @SDL_VIDEO_DRIVER_PS2@

include/SDL_config.h.in

@@ -292,7 +292,6 @@
 #undef SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC
 #undef SDL_AUDIO_DRIVER_PULSEAUDIO
 #undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC
-#undef SDL_AUDIO_DRIVER_QSA
 #undef SDL_AUDIO_DRIVER_WASAPI
 
 /* Enable various input drivers */
@@ -388,7 +387,6 @@
 #undef SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
 #undef SDL_VIDEO_DRIVER_VIVANTE
 #undef SDL_VIDEO_DRIVER_VIVANTE_VDK
-#undef SDL_VIDEO_DRIVER_QNX
 #undef SDL_VIDEO_DRIVER_RISCOS
 
 #undef SDL_VIDEO_RENDER_D3D

src/audio/SDL_audio.c

@@ -45,9 +45,6 @@ static const AudioBootStrap *const bootstrap[] = {
 #if SDL_AUDIO_DRIVER_NETBSD
     &NETBSDAUDIO_bootstrap,
 #endif
-#if SDL_AUDIO_DRIVER_QSA
-    &QSAAUDIO_bootstrap,
-#endif
 #if SDL_AUDIO_DRIVER_WASAPI
     &WASAPI_bootstrap,
 #endif

src/audio/SDL_sysaudio.h

@@ -186,7 +186,6 @@ extern AudioBootStrap PULSEAUDIO_bootstrap;
 extern AudioBootStrap ALSA_bootstrap;
 extern AudioBootStrap NETBSDAUDIO_bootstrap;
 extern AudioBootStrap DSP_bootstrap;
-extern AudioBootStrap QSAAUDIO_bootstrap;
 extern AudioBootStrap WASAPI_bootstrap;
 extern AudioBootStrap DSOUND_bootstrap;
 extern AudioBootStrap WINMM_bootstrap;

src/audio/qsa/SDL_qsa_audio.h

@@ -1,54 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "../../SDL_internal.h"
-
-#ifndef __SDL_QSA_AUDIO_H__
-#define __SDL_QSA_AUDIO_H__
-
-#include <sys/asoundlib.h>
-
-#include "../SDL_sysaudio.h"
-
-/* Hidden "this" pointer for the audio functions */
-#define _THIS SDL_AudioDevice* this
-
-struct SDL_PrivateAudioData
-{
-    /* The audio device handle */
-    int cardno;
-    int deviceno;
-    snd_pcm_t *audio_handle;
-
-    /* The audio file descriptor */
-    int audio_fd;
-
-    /* Select timeout status */
-    uint32_t timeout_on_wait;
-
-    /* Raw mixing buffer */
-    Uint8 *pcm_buf;
-    Uint32 pcm_len;
-};
-
-#endif /* __SDL_QSA_AUDIO_H__ */
-
-/* vi: set ts=4 sw=4 expandtab: */

src/cpuinfo/SDL_cpuinfo.c

@@ -54,10 +54,6 @@
 #include <setjmp.h>
 #endif
 
-#if defined(__QNXNTO__)
-#include <sys/syspage.h>
-#endif
-
 #if (defined(__LINUX__) || defined(__ANDROID__)) && defined(__arm__)
 #include <unistd.h>
 #include <sys/types.h>
@@ -476,8 +472,6 @@ CPU_haveNEON(void)
     if (elf_aux_info(AT_HWCAP, (void *)&hasneon, (int)sizeof(hasneon)) != 0)
         return 0;
     return ((hasneon & HWCAP_NEON) == HWCAP_NEON);
-#elif defined(__QNXNTO__)
-    return SYSPAGE_ENTRY(cpuinfo)->flags & ARM_CPU_FLAG_NEON;
 #elif (defined(__LINUX__) || defined(__ANDROID__)) && defined(HAVE_GETAUXVAL)
     return ((getauxval(AT_HWCAP) & HWCAP_NEON) == HWCAP_NEON);
 #elif defined(__LINUX__)

src/dynapi/SDL_dynapi.c

@@ -334,7 +334,7 @@ static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
     return retval;
 }
 
-#elif defined(unix) || defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__) || defined(__QNX__)
+#elif defined(unix) || defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__)
 #include <dlfcn.h>
 static SDL_INLINE void *get_sdlapi_entry(const char *fname, const char *sym)
 {

src/file/SDL_rwops.c

@@ -19,14 +19,10 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* We won't get fseeko64 on QNX if _LARGEFILE64_SOURCE is defined, but the
-   configure script knows the C runtime has it and enables it. */
-#ifndef __QNXNTO__
 /* Need this so Linux systems define fseek64o, ftell64o and off64_t */
 #ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
 #endif
-#endif
 
 #include "../SDL_internal.h"
 
@@ -37,7 +33,6 @@
 #ifdef HAVE_STDIO_H
 #include <stdio.h>
 #endif
-
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif

src/filesystem/unix/SDL_sysfilesystem.c

@@ -43,8 +43,6 @@
 #include "SDL_filesystem.h"
 #include "SDL_rwops.h"
 
-/* QNX's /proc/self/exefile is a text file and not a symlink. */
-#if !defined(__QNXNTO__)
 static char *
 readSymLink(const char *path)
 {
@@ -76,8 +74,6 @@ readSymLink(const char *path)
     SDL_free(retval);
     return NULL;
 }
-#endif
-
 
 #if defined(__OPENBSD__)
 static char *search_path_for_binary(const char *bin)
@@ -228,8 +224,6 @@ SDL_GetBasePath(void)
         retval = readSymLink("/proc/curproc/file");
 #elif defined(__NETBSD__)
         retval = readSymLink("/proc/curproc/exe");
-#elif defined(__QNXNTO__)
-        retval = SDL_LoadFile("/proc/self/exefile", NULL);
 #else
         retval = readSymLink("/proc/self/exe");  /* linux. */
         if (retval == NULL) {

src/video/SDL_sysvideo.h

@@ -470,7 +470,6 @@ extern VideoBootStrap DUMMY_evdev_bootstrap;
 extern VideoBootStrap Wayland_bootstrap;
 extern VideoBootStrap VIVANTE_bootstrap;
 extern VideoBootStrap Emscripten_bootstrap;
-extern VideoBootStrap QNX_bootstrap;
 extern VideoBootStrap OFFSCREEN_bootstrap;
 extern VideoBootStrap NGAGE_bootstrap;
 

src/video/SDL_video.c

@@ -119,9 +119,6 @@ static VideoBootStrap *bootstrap[] = {
 #if SDL_VIDEO_DRIVER_EMSCRIPTEN
     &Emscripten_bootstrap,
 #endif
-#if SDL_VIDEO_DRIVER_QNX
-    &QNX_bootstrap,
-#endif
 #if SDL_VIDEO_DRIVER_OFFSCREEN
     &OFFSCREEN_bootstrap,
 #endif

src/video/qnx/gl.c

@@ -1,285 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 2017 BlackBerry Limited
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "../../SDL_internal.h"
-#include "sdl_qnx.h"
-
-static EGLDisplay   egl_disp;
-
-/**
- * Detertmines the pixel format to use based on the current display and EGL
- * configuration.
- * @param   egl_conf    EGL configuration to use
- * @return  A SCREEN_FORMAT* constant for the pixel format to use
- */
-static int
-chooseFormat(EGLConfig egl_conf)
-{
-    EGLint buffer_bit_depth;
-    EGLint alpha_bit_depth;
-
-    eglGetConfigAttrib(egl_disp, egl_conf, EGL_BUFFER_SIZE, &buffer_bit_depth);
-    eglGetConfigAttrib(egl_disp, egl_conf, EGL_ALPHA_SIZE, &alpha_bit_depth);
-
-    switch (buffer_bit_depth) {
-        case 32:
-            return SCREEN_FORMAT_RGBX8888;
-        case 24:
-            return SCREEN_FORMAT_RGB888;
-        case 16:
-            switch (alpha_bit_depth) {
-                case 4:
-                    return SCREEN_FORMAT_RGBX4444;
-                case 1:
-                    return SCREEN_FORMAT_RGBA5551;
-                default:
-                    return SCREEN_FORMAT_RGB565;
-            }
-        default:
-            return 0;
-    }
-}
-
-/**
- * Enumerates the supported EGL configurations and chooses a suitable one.
- * @param[out]  pconf   The chosen configuration
- * @param[out]  pformat The chosen pixel format
- * @return 0 if successful, -1 on error
- */
-int
-glGetConfig(EGLConfig *pconf, int *pformat)
-{
-    EGLConfig egl_conf = (EGLConfig)0;
-    EGLConfig *egl_configs;
-    EGLint egl_num_configs;
-    EGLint val;
-    EGLBoolean rc;
-    EGLint i;
-
-    // Determine the numbfer of configurations.
-    rc = eglGetConfigs(egl_disp, NULL, 0, &egl_num_configs);
-    if (rc != EGL_TRUE) {
-        return -1;
-    }
-
-    if (egl_num_configs == 0) {
-        return -1;
-    }
-
-    // Allocate enough memory for all configurations.
-    egl_configs = SDL_malloc(egl_num_configs * sizeof(*egl_configs));
-    if (egl_configs == NULL) {
-        return -1;
-    }
-
-    // Get the list of configurations.
-    rc = eglGetConfigs(egl_disp, egl_configs, egl_num_configs,
-                       &egl_num_configs);
-    if (rc != EGL_TRUE) {
-        SDL_free(egl_configs);
-        return -1;
-    }
-
-    // Find a good configuration.
-    for (i = 0; i < egl_num_configs; i++) {
-        eglGetConfigAttrib(egl_disp, egl_configs[i], EGL_SURFACE_TYPE, &val);
-        if (!(val & EGL_WINDOW_BIT)) {
-            continue;
-        }
-
-        eglGetConfigAttrib(egl_disp, egl_configs[i], EGL_RENDERABLE_TYPE, &val);
-        if (!(val & EGL_OPENGL_ES2_BIT)) {
-            continue;
-        }
-
-        eglGetConfigAttrib(egl_disp, egl_configs[i], EGL_DEPTH_SIZE, &val);
-        if (val == 0) {
-            continue;
-        }
-
-        egl_conf = egl_configs[i];
-        break;
-    }
-
-    SDL_free(egl_configs);
-    *pconf = egl_conf;
-    *pformat = chooseFormat(egl_conf);
-
-    return 0;
-}
-
-/**
- * Initializes the EGL library.
- * @param   _THIS
- * @param   name    unused
- * @return  0 if successful, -1 on error
- */
-int
-glLoadLibrary(_THIS, const char *name)
-{
-    EGLNativeDisplayType    disp_id = EGL_DEFAULT_DISPLAY;
-
-    egl_disp = eglGetDisplay(disp_id);
-    if (egl_disp == EGL_NO_DISPLAY) {
-        return -1;
-    }
-
-    if (eglInitialize(egl_disp, NULL, NULL) == EGL_FALSE) {
-        return -1;
-    }
-
-    return 0;
-}
-
-/**
- * Finds the address of an EGL extension function.
- * @param   proc    Function name
- * @return  Function address
- */
-void *
-glGetProcAddress(_THIS, const char *proc)
-{
-    return eglGetProcAddress(proc);
-}
-
-/**
- * Associates the given window with the necessary EGL structures for drawing and
- * displaying content.
- * @param   _THIS
- * @param   window  The SDL window to create the context for
- * @return  A pointer to the created context, if successful, NULL on error
- */
-SDL_GLContext
-glCreateContext(_THIS, SDL_Window *window)
-{
-    window_impl_t   *impl = (window_impl_t *)window->driverdata;
-    EGLContext      context;
-    EGLSurface      surface;
-
-    struct {
-        EGLint client_version[2];
-        EGLint none;
-    } egl_ctx_attr = {
-        .client_version = { EGL_CONTEXT_CLIENT_VERSION, 2 },
-        .none = EGL_NONE
-    };
-
-    struct {
-        EGLint render_buffer[2];
-        EGLint none;
-    } egl_surf_attr = {
-        .render_buffer = { EGL_RENDER_BUFFER, EGL_BACK_BUFFER },
-        .none = EGL_NONE
-    };
-
-    context = eglCreateContext(egl_disp, impl->conf, EGL_NO_CONTEXT,
-                               (EGLint *)&egl_ctx_attr);
-    if (context == EGL_NO_CONTEXT) {
-        return NULL;
-    }
-
-    surface = eglCreateWindowSurface(egl_disp, impl->conf, impl->window,
-                                     (EGLint *)&egl_surf_attr);
-    if (surface == EGL_NO_SURFACE) {
-        return NULL;
-    }
-
-    eglMakeCurrent(egl_disp, surface, surface, context);
-
-    impl->surface = surface;
-    return context;
-}
-
-/**
- * Sets a new value for the number of frames to display before swapping buffers.
- * @param   _THIS
- * @param   interval    New interval value
- * @return  0 if successful, -1 on error
- */
-int
-glSetSwapInterval(_THIS, int interval)
-{
-    if (eglSwapInterval(egl_disp, interval) != EGL_TRUE) {
-        return -1;
-    }
-
-    return 0;
-}
-
-/**
- * Swaps the EGL buffers associated with the given window
- * @param   _THIS
- * @param   window  Window to swap buffers for
- * @return  0 if successful, -1 on error
- */
-int
-glSwapWindow(_THIS, SDL_Window *window)
-{
-    /* !!! FIXME: should we migrate this all over to use SDL_egl.c? */
-    window_impl_t   *impl = (window_impl_t *)window->driverdata;
-    return eglSwapBuffers(egl_disp, impl->surface) == EGL_TRUE ? 0 : -1;
-}
-
-/**
- * Makes the given context the current one for drawing operations.
- * @param   _THIS
- * @param   window  SDL window associated with the context (maybe NULL)
- * @param   context The context to activate
- * @return  0 if successful, -1 on error
- */
-int
-glMakeCurrent(_THIS, SDL_Window *window, SDL_GLContext context)
-{
-    window_impl_t   *impl;
-    EGLSurface      surface = NULL;
-
-    if (window) {
-        impl = (window_impl_t *)window->driverdata;
-        surface = impl->surface;
-    }
-
-    if (eglMakeCurrent(egl_disp, surface, surface, context) != EGL_TRUE) {
-        return -1;
-    }
-
-    return 0;
-}
-
-/**
- * Destroys a context.
- * @param   _THIS
- * @param   context The context to destroy
- */
-void
-glDeleteContext(_THIS, SDL_GLContext context)
-{
-    eglDestroyContext(egl_disp, context);
-}
-
-/**
- * Terminates access to the EGL library.
- * @param   _THIS
- */
-void
-glUnloadLibrary(_THIS)
-{
-    eglTerminate(egl_disp);
-}

src/video/qnx/keyboard.c

@@ -1,133 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 2017 BlackBerry Limited
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#include "../../SDL_internal.h"
-#include "../../events/SDL_keyboard_c.h"
-#include "SDL_scancode.h"
-#include "SDL_events.h"
-#include "sdl_qnx.h"
-#include <sys/keycodes.h>
-
-/**
- * A map thta translates Screen key names to SDL scan codes.
- * This map is incomplete, but should include most major keys.
- */
-static int key_to_sdl[] = {
-    [KEYCODE_SPACE] = SDL_SCANCODE_SPACE,
-    [KEYCODE_APOSTROPHE] = SDL_SCANCODE_APOSTROPHE,
-    [KEYCODE_COMMA] = SDL_SCANCODE_COMMA,
-    [KEYCODE_MINUS] = SDL_SCANCODE_MINUS,
-    [KEYCODE_PERIOD] = SDL_SCANCODE_PERIOD,
-    [KEYCODE_SLASH] = SDL_SCANCODE_SLASH,
-    [KEYCODE_ZERO] = SDL_SCANCODE_0,
-    [KEYCODE_ONE] = SDL_SCANCODE_1,
-    [KEYCODE_TWO] = SDL_SCANCODE_2,
-    [KEYCODE_THREE] = SDL_SCANCODE_3,
-    [KEYCODE_FOUR] = SDL_SCANCODE_4,
-    [KEYCODE_FIVE] = SDL_SCANCODE_5,
-    [KEYCODE_SIX] = SDL_SCANCODE_6,
-    [KEYCODE_SEVEN] = SDL_SCANCODE_7,
-    [KEYCODE_EIGHT] = SDL_SCANCODE_8,
-    [KEYCODE_NINE] = SDL_SCANCODE_9,
-    [KEYCODE_SEMICOLON] = SDL_SCANCODE_SEMICOLON,
-    [KEYCODE_EQUAL] = SDL_SCANCODE_EQUALS,
-    [KEYCODE_LEFT_BRACKET] = SDL_SCANCODE_LEFTBRACKET,
-    [KEYCODE_BACK_SLASH] = SDL_SCANCODE_BACKSLASH,
-    [KEYCODE_RIGHT_BRACKET] = SDL_SCANCODE_RIGHTBRACKET,
-    [KEYCODE_GRAVE] = SDL_SCANCODE_GRAVE,
-    [KEYCODE_A] = SDL_SCANCODE_A,
-    [KEYCODE_B] = SDL_SCANCODE_B,
-    [KEYCODE_C] = SDL_SCANCODE_C,
-    [KEYCODE_D] = SDL_SCANCODE_D,
-    [KEYCODE_E] = SDL_SCANCODE_E,
-    [KEYCODE_F] = SDL_SCANCODE_F,
-    [KEYCODE_G] = SDL_SCANCODE_G,
-    [KEYCODE_H] = SDL_SCANCODE_H,
-    [KEYCODE_I] = SDL_SCANCODE_I,
-    [KEYCODE_J] = SDL_SCANCODE_J,
-    [KEYCODE_K] = SDL_SCANCODE_K,
-    [KEYCODE_L] = SDL_SCANCODE_L,
-    [KEYCODE_M] = SDL_SCANCODE_M,
-    [KEYCODE_N] = SDL_SCANCODE_N,
-    [KEYCODE_O] = SDL_SCANCODE_O,
-    [KEYCODE_P] = SDL_SCANCODE_P,
-    [KEYCODE_Q] = SDL_SCANCODE_Q,
-    [KEYCODE_R] = SDL_SCANCODE_R,
-    [KEYCODE_S] = SDL_SCANCODE_S,
-    [KEYCODE_T] = SDL_SCANCODE_T,
-    [KEYCODE_U] = SDL_SCANCODE_U,
-    [KEYCODE_V] = SDL_SCANCODE_V,
-    [KEYCODE_W] = SDL_SCANCODE_W,
-    [KEYCODE_X] = SDL_SCANCODE_X,
-    [KEYCODE_Y] = SDL_SCANCODE_Y,
-    [KEYCODE_Z] = SDL_SCANCODE_Z,
-    [KEYCODE_UP] = SDL_SCANCODE_UP,
-    [KEYCODE_DOWN] = SDL_SCANCODE_DOWN,
-    [KEYCODE_LEFT] = SDL_SCANCODE_LEFT,
-    [KEYCODE_PG_UP] = SDL_SCANCODE_PAGEUP,
-    [KEYCODE_PG_DOWN] = SDL_SCANCODE_PAGEDOWN,
-    [KEYCODE_RIGHT] = SDL_SCANCODE_RIGHT,
-    [KEYCODE_RETURN] = SDL_SCANCODE_RETURN,
-    [KEYCODE_TAB] = SDL_SCANCODE_TAB,
-    [KEYCODE_ESCAPE] = SDL_SCANCODE_ESCAPE,
-};
-
-/**
- * Called from the event dispatcher when a keyboard event is encountered.
- * Translates the event such that it can be handled by SDL.
- * @param   event   Screen keyboard event
- */
-void
-handleKeyboardEvent(screen_event_t event)
-{
-    int             val;
-    SDL_Scancode    scancode;
-
-    // Get the key value.
-    if (screen_get_event_property_iv(event, SCREEN_PROPERTY_SYM, &val) < 0) {
-        return;
-    }
-
-    // Skip unrecognized keys.
-    if ((val < 0) || (val >= SDL_TABLESIZE(key_to_sdl))) {
-        return;
-    }
-
-    // Translate to an SDL scan code.
-    scancode = key_to_sdl[val];
-    if (scancode == 0) {
-        return;
-    }
-
-    // Get event flags (key state).
-    if (screen_get_event_property_iv(event, SCREEN_PROPERTY_FLAGS, &val) < 0) {
-        return;
-    }
-
-    // Propagate the event to SDL.
-    // FIXME:
-    // Need to handle more key states (such as key combinations).
-    if (val & KEY_DOWN) {
-        SDL_SendKeyboardKey(SDL_PRESSED, scancode);
-    } else {
-        SDL_SendKeyboardKey(SDL_RELEASED, scancode);
-    }
-}

src/video/qnx/sdl_qnx.h

@@ -1,48 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 2017 BlackBerry Limited
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef __SDL_QNX_H__
-#define __SDL_QNX_H__
-
-#include "../SDL_sysvideo.h"
-#include <screen/screen.h>
-#include <EGL/egl.h>
-
-typedef struct
-{
-    screen_window_t window;
-    EGLSurface      surface;
-    EGLConfig       conf;
-} window_impl_t;
-
-extern void handleKeyboardEvent(screen_event_t event);
-
-extern int glGetConfig(EGLConfig *pconf, int *pformat);
-extern int glLoadLibrary(_THIS, const char *name);
-void *glGetProcAddress(_THIS, const char *proc);
-extern SDL_GLContext glCreateContext(_THIS, SDL_Window *window);
-extern int glSetSwapInterval(_THIS, int interval);
-extern int glSwapWindow(_THIS, SDL_Window *window);
-extern int glMakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
-extern void glDeleteContext(_THIS, SDL_GLContext context);
-extern void glUnloadLibrary(_THIS);
-
-#endif

src/video/qnx/video.c

@@ -1,358 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 2017 BlackBerry Limited
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-#include "../../SDL_internal.h"
-#include "../SDL_sysvideo.h"
-#include "sdl_qnx.h"
-
-static screen_context_t context;
-static screen_event_t   event;
-
-/**
- * Initializes the QNX video plugin.
- * Creates the Screen context and event handles used for all window operations
- * by the plugin.
- * @param   _THIS
- * @return  0 if successful, -1 on error
- */
-static int
-videoInit(_THIS)
-{
-    SDL_VideoDisplay display;
-
-    if (screen_create_context(&context, 0) < 0) {
-        return -1;
-    }
-
-    if (screen_create_event(&event) < 0) {
-        return -1;
-    }
-
-    SDL_zero(display);
-
-    if (SDL_AddVideoDisplay(&display, SDL_FALSE) < 0) {
-        return -1;
-    }
-
-    _this->num_displays = 1;
-    return 0;
-}
-
-static void
-videoQuit(_THIS)
-{
-}
-
-/**
- * Creates a new native Screen window and associates it with the given SDL
- * window.
- * @param   _THIS
- * @param   window  SDL window to initialize
- * @return  0 if successful, -1 on error
- */
-static int
-createWindow(_THIS, SDL_Window *window)
-{
-    window_impl_t   *impl;
-    int             size[2];
-    int             numbufs;
-    int             format;
-    int             usage;
-
-    impl = SDL_calloc(1, sizeof(*impl));
-    if (impl == NULL) {
-        return -1;
-    }
-
-    // Create a native window.
-    if (screen_create_window(&impl->window, context) < 0) {
-        goto fail;
-    }
-
-    // Set the native window's size to match the SDL window.
-    size[0] = window->w;
-    size[1] = window->h;
-
-    if (screen_set_window_property_iv(impl->window, SCREEN_PROPERTY_SIZE,
-                                      size) < 0) {
-        goto fail;
-    }
-
-    if (screen_set_window_property_iv(impl->window, SCREEN_PROPERTY_SOURCE_SIZE,
-                                      size) < 0) {
-        goto fail;
-    }
-
-    // Create window buffer(s).
-    if (window->flags & SDL_WINDOW_OPENGL) {
-        if (glGetConfig(&impl->conf, &format) < 0) {
-            goto fail;
-        }
-        numbufs = 2;
-
-        usage = SCREEN_USAGE_OPENGL_ES2;
-        if (screen_set_window_property_iv(impl->window, SCREEN_PROPERTY_USAGE,
-                                          &usage) < 0) {
-            return -1;
-        }
-    } else {
-        format = SCREEN_FORMAT_RGBX8888;
-        numbufs = 1;
-    }
-
-    // Set pixel format.
-    if (screen_set_window_property_iv(impl->window, SCREEN_PROPERTY_FORMAT,
-                                      &format) < 0) {
-        goto fail;
-    }
-
-    // Create buffer(s).
-    if (screen_create_window_buffers(impl->window, numbufs) < 0) {
-        goto fail;
-    }
-
-    window->driverdata = impl;
-    return 0;
-
-fail:
-    if (impl->window) {
-        screen_destroy_window(impl->window);
-    }
-
-    SDL_free(impl);
-    return -1;
-}
-
-/**
- * Gets a pointer to the Screen buffer associated with the given window. Note
- * that the buffer is actually created in createWindow().
- * @param       _THIS
- * @param       window  SDL window to get the buffer for
- * @param[out]  pixles  Holds a pointer to the window's buffer
- * @param[out]  format  Holds the pixel format for the buffer
- * @param[out]  pitch   Holds the number of bytes per line
- * @return  0 if successful, -1 on error
- */
-static int
-createWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format,
-                        void ** pixels, int *pitch)
-{
-    window_impl_t   *impl = (window_impl_t *)window->driverdata;
-    screen_buffer_t buffer;
-
-    // Get a pointer to the buffer's memory.
-    if (screen_get_window_property_pv(impl->window, SCREEN_PROPERTY_BUFFERS,
-                                      (void **)&buffer) < 0) {
-        return -1;
-    }
-
-    if (screen_get_buffer_property_pv(buffer, SCREEN_PROPERTY_POINTER,
-                                      pixels) < 0) {
-        return -1;
-    }
-
-    // Set format and pitch.
-    if (screen_get_buffer_property_iv(buffer, SCREEN_PROPERTY_STRIDE,
-                                      pitch) < 0) {
-        return -1;
-    }
-
-    *format = SDL_PIXELFORMAT_RGB888;
-    return 0;
-}
-
-/**
- * Informs the window manager that the window needs to be updated.
- * @param   _THIS
- * @param   window      The window to update
- * @param   rects       An array of reectangular areas to update
- * @param   numrects    Rect array length
- * @return  0 if successful, -1 on error
- */
-static int
-updateWindowFramebuffer(_THIS, SDL_Window *window, const SDL_Rect *rects,
-                        int numrects)
-{
-    window_impl_t   *impl = (window_impl_t *)window->driverdata;
-    screen_buffer_t buffer;
-
-    if (screen_get_window_property_pv(impl->window, SCREEN_PROPERTY_BUFFERS,
-                                      (void **)&buffer) < 0) {
-        return -1;
-    }
-
-    screen_post_window(impl->window, buffer, numrects, (int *)rects, 0);
-    screen_flush_context(context, 0);
-    return 0;
-}
-
-/**
- * Runs the main event loop.
- * @param   _THIS
- */
-static void
-pumpEvents(_THIS)
-{
-    int             type;
-
-    for (;;) {
-        if (screen_get_event(context, event, 0) < 0) {
-            break;
-        }
-
-        if (screen_get_event_property_iv(event, SCREEN_PROPERTY_TYPE, &type)
-            < 0) {
-            break;
-        }
-
-        if (type == SCREEN_EVENT_NONE) {
-            break;
-        }
-
-        switch (type) {
-        case SCREEN_EVENT_KEYBOARD:
-            handleKeyboardEvent(event);
-            break;
-
-        default:
-            break;
-        }
-    }
-}
-
-/**
- * Updates the size of the native window using the geometry of the SDL window.
- * @param   _THIS
- * @param   window  SDL window to update
- */
-static void
-setWindowSize(_THIS, SDL_Window *window)
-{
-    window_impl_t   *impl = (window_impl_t *)window->driverdata;
-    int             size[2];
-
-    size[0] = window->w;
-    size[1] = window->h;
-
-    screen_set_window_property_iv(impl->window, SCREEN_PROPERTY_SIZE, size);
-    screen_set_window_property_iv(impl->window, SCREEN_PROPERTY_SOURCE_SIZE,
-                                  size);
-}
-
-/**
- * Makes the native window associated with the given SDL window visible.
- * @param   _THIS
- * @param   window  SDL window to update
- */
-static void
-showWindow(_THIS, SDL_Window *window)
-{
-    window_impl_t   *impl = (window_impl_t *)window->driverdata;
-    const int       visible = 1;
-
-    screen_set_window_property_iv(impl->window, SCREEN_PROPERTY_VISIBLE,
-                                  &visible);
-}
-
-/**
- * Makes the native window associated with the given SDL window invisible.
- * @param   _THIS
- * @param   window  SDL window to update
- */
-static void
-hideWindow(_THIS, SDL_Window *window)
-{
-    window_impl_t   *impl = (window_impl_t *)window->driverdata;
-    const int       visible = 0;
-
-    screen_set_window_property_iv(impl->window, SCREEN_PROPERTY_VISIBLE,
-        &visible);
-}
-
-/**
- * Destroys the native window associated with the given SDL window.
- * @param   _THIS
- * @param   window  SDL window that is being destroyed
- */
-static void
-destroyWindow(_THIS, SDL_Window *window)
-{
-    window_impl_t   *impl = (window_impl_t *)window->driverdata;
-
-    if (impl) {
-        screen_destroy_window(impl->window);
-        window->driverdata = NULL;
-    }
-}
-
-/**
- * Frees the plugin object created by createDevice().
- * @param   device  Plugin object to free
- */
-static void
-deleteDevice(SDL_VideoDevice *device)
-{
-    SDL_free(device);
-}
-
-/**
- * Creates the QNX video plugin used by SDL.
- * @param   devindex    Unused
- * @return  Initialized device if successful, NULL otherwise
- */
-static SDL_VideoDevice *
-createDevice(int devindex)
-{
-    SDL_VideoDevice *device;
-
-    device = (SDL_VideoDevice *)SDL_calloc(1, sizeof(SDL_VideoDevice));
-    if (device == NULL) {
-        return NULL;
-    }
-
-    device->driverdata = NULL;
-    device->VideoInit = videoInit;
-    device->VideoQuit = videoQuit;
-    device->CreateSDLWindow = createWindow;
-    device->CreateWindowFramebuffer = createWindowFramebuffer;
-    device->UpdateWindowFramebuffer = updateWindowFramebuffer;
-    device->SetWindowSize = setWindowSize;
-    device->ShowWindow = showWindow;
-    device->HideWindow = hideWindow;
-    device->PumpEvents = pumpEvents;
-    device->DestroyWindow = destroyWindow;
-
-    device->GL_LoadLibrary = glLoadLibrary;
-    device->GL_GetProcAddress = glGetProcAddress;
-    device->GL_CreateContext = glCreateContext;
-    device->GL_SetSwapInterval = glSetSwapInterval;
-    device->GL_SwapWindow = glSwapWindow;
-    device->GL_MakeCurrent = glMakeCurrent;
-    device->GL_DeleteContext = glDeleteContext;
-    device->GL_UnloadLibrary = glUnloadLibrary;
-
-    device->free = deleteDevice;
-    return device;
-}
-
-VideoBootStrap QNX_bootstrap = {
-    "qnx", "QNX Screen",
-    createDevice
-};

src/video/x11/SDL_x11opengl.c

@@ -41,8 +41,6 @@
 #define DEFAULT_OPENGL  "libGL.so"
 #elif defined(__MACOSX__)
 #define DEFAULT_OPENGL  "/opt/X11/lib/libGL.1.dylib"
-#elif defined(__QNXNTO__)
-#define DEFAULT_OPENGL  "libGL.so.3"
 #else
 #define DEFAULT_OPENGL  "libGL.so.1"
 #endif

test/configure

@@ -3641,11 +3641,6 @@ fi
             SYS_GL_LIBS="-lOSMesa"
         fi
         ;;
-    *-*-qnx*)
-        EXE=""
-        MATHLIB=""
-        SYS_GL_LIBS="-lGLES_CM"
-        ;;
     *-*-emscripten*)
                 EXE=".bc"
         MATHLIB=""

test/configure.ac

@@ -59,11 +59,6 @@ case "$host" in
             SYS_GL_LIBS="-lOSMesa"
         fi
         ;;
-    *-*-qnx*)
-        EXE=""
-        MATHLIB=""
-        SYS_GL_LIBS="-lGLES_CM"
-        ;;
     *-*-emscripten*)
         dnl This should really be .js, but we need to specify extra flags when compiling to js
         EXE=".bc"