Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Date: Mon, 23 Mar 2009 09:17:24 +0200
Browse files Browse the repository at this point in the history 
From: "Mike Gorchak"
Subject: New QNX patches

Please apply patch qnx4.diff, which is attached. What has been done:
1)Added back OpenGL ES renderer for QNX target. Added few corrections to
OpenGL ES renderer to let it work under QNX. OpenGL ES renderer do not
support textures under QNX, so I think some additional work must be done.
2) Added GL_OES_query_matrix extension to SDL_opengles.h header file, which
required by OpenGL ES 1.1 specification.
3) Added attribute clearing at the entrance of function
SDL_GL_GetAttribure(). Added error checking into the function
SDL_GL_GetAttribure(), because some attributes can't be obtained in OpenGL
ES 1.0.
4) Porting testdyngles to OpenGL ES 1.0 (1.1 has glColor4ub() and
glColor4f() functions, but 1.0 has glColor4f() only).
5) Added error checking after obtaining attributes using
SDL_GL_GetAttribute() function to the testgl2 and testgles.
6) Small correction to testmultiaudio with printing errors.
7) Added software and accelerated OpenGL ES 1.0 support into the QNX GF
driver.

Please remove ./src/audio/nto directory - it will not be used anymore.
Please create ./src/audio/qsa directory and add content of the archive
qsa.tar.gz into this directory. I rewrote some sound code, added support for
multiple audio cards, enumeration, etc. Added initial support for capture.

As far as I can understand SDL 1.3 is not supporting audio capture right now
? Sam, Am I right ? Or audio capture must be supported through the
PlayDevice routine ?

And last, please put file SDL_gf_opengles.c to  the ./src/video/qnxgf
directory. It is OpenGL ES 1.1 emulation layer for some functions, which are
not supported by OpenGL ES 1.0.
  • Loading branch information
@slouken
slouken committed Mar 24, 2009
1 parent c32c056 commit 00f5d0d
Show file tree
Hide file tree
Showing 18 changed files with 1,817 additions and 640 deletions.
103 changes: 76 additions & 27 deletions README.QNX
View file
@@ -1,7 +1,38 @@
README.QNX by Mike Gorchak <mike@malva.ua>, <lestat@i.com.ua>
Last changed at 10 Mar 2009.
Last changed at 22 Mar 2009.

QNX Photon and GF drivers are under construction. Please be patient.
QNX Photon and GF drivers are being constructed.
QNX QSA (QNX Sound Architecture) driver is ready.
QNX CDROM driver is ready.
QNX HID input driver is being constructed.

----------------------
-- SDL QSA driver --
----------------------

Due to QNX Sound Architecture limitations software could not determine
what playback channels are designed for, so some casus can be. For example,
output after testmultiaudio test utility execution:

Using audio driver: qsa
playing on device #0: ('Vortex 8820 @ fb000000 d0')...done.
playing on device #1: ('Vortex 8820 @ fb000000 d1')...done.
playing on device #2: ('i8x0 @ d800 d0')...done.
playing on device #3: ('i8x0 @ d800 d1')...done.
playing on all devices...
Open device 3 failed: QSA: snd_pcm_channel_params failed: Invalid argument

If speakers are connected to both audio cards: Vortex 8820 and Intel
Integrated Audio we can hear sound playback on device #0 and devices #2, #3
only. Device #1 is an unknown PCM channel which does not produce any sound.

As for error during device #3 opening, it's caused by QSA software mixer
channel, because it can't open real hardware device #2, since it's already
opened by SDL.

After simultaneous sound playback on all devices utility testmultiaudio
stays running waiting for sound playback finish on device #1, which is
locked up due to some Aureal Vortex 8820 driver limitations.

---------------------
-- SDL GF driver --
Expand All @@ -15,43 +46,61 @@ Here is an additional information about SDL GF driver:

0. Introduction.

SDL GF driver is a layer between SDL and QNX Graphics Framework (GF). Hardware
accelerated features which SDL could support depends on real hardware capabilities.
SDL GF driver is a layer between SDL and QNX Graphics Framework (GF).
SDL GF driver also supports OpenGL ES through the QNX Graphics Framework.
Hardware accelerated features which SDL can support depend on real hardware
capabilities.

1. Environment variables which GF driver supports.

GF driver supports the following environment variables for QNX GF specific
customization options:
a) SDL_VIDEO_GF_REFRESH_RATE - refresh rate of video output in Hz. Without
this environment variable declaration SDL controls refresh rate of your
display. If this enironment variable is set to 0, SDL will control refresh
rate of display, otherwise value of SDL_VIDEO_GF_REFRESH_RATE is used for
all screen resolutions as refresh rate. This example will set 60Hz refresh
rate as refresh rate for all graphics modes:
GF driver supports the following environment variables for QNX GF
specific customization options:
a) SDL_VIDEO_GF_REFRESH_RATE - refresh rate of video output in Hz.
Without this environment variable declaration SDL controls refresh
rate of your display. If this enironment variable is set to 0, SDL
will control refresh rate of display, otherwise value of flag
SDL_VIDEO_GF_REFRESH_RATE is used for all screen resolutions as
refresh rate. This example will set 60Hz refresh rate as refresh rate
for all graphics modes:

export SDL_VIDEO_GF_REFRESH_RATE=60

2. Custom video modes.

Since most QNX graphics drivers supports GENERIC video modes, i.e. you could
specify any horizontal and vertical resolution and any refresh rate, SDL GF
driver uses its own fullscreen modes list, which could be incomplete. You could
add any custom video mode, which your QNX graphics driver supports by editing
file ./src/video/qnxgf/SDL_qnxgf.c. Custom graphics mode definition looks like
Since most QNX graphics drivers support GENERIC video modes, i.e. you
can specify any horizontal and vertical resolution and any refresh rate,
SDL GF driver uses its own fullscreen modes list, which can be incomplete.
You can add any custom video mode, which your QNX graphics driver supports
by editing file ./src/video/qnxgf/SDL_qnxgf.c. Custom graphics mode
definition looks like this:

{0, 1024, 640, 60, NULL}, /* 1024x640 mode is 60Hz only */
{0, 1024, 640, 60, NULL}, /* 1024x640 mode is 60Hz only */

You must specify horizontal resolution as second parameter, vertical resolution
as third parameter and refresh rate as fourth parameter. Please leave first and
last parameters as 0 and NULL. Then please send me your changes to e-mail address
which is specified in the header of this document.
You must specify horizontal resolution as the second parameter, vertical
resolution as the third one and refresh rate as the fourth parameter.
Please leave the first and the last parameters as 0 and NULL. Then send me
your changes to e-mail address which is specified in the header of this
document.

3. Limitations.

There are few limitations while using SDL GF driver:

a) Since GF driver supports fullscreen modes only, when you are not specifing
SDL_WINDOW_FULLSCREEN flag, an SDL GF driver will try to find the fullscreen
graphics mode which corresponds to SDL window size. Refresh rate will be the
lowest available, if SDL_VIDEO_GF_REFRESH_RATE environment variable is not set.

a) Since GF driver supports fullscreen modes only, when flag
SDL_WINDOW_FULLSCREEN is not specified, SDL GF driver will try to find the
fullscreen graphics mode which corresponds to SDL window size. Refresh rate
will be the lowest available, if SDL_VIDEO_GF_REFRESH_RATE environment
variable is not set.
b) As confirmed by QSSL none of existing video drivers has support of
doublescan low-resolution video modes. So modes below 640x480 are not
supported. If your video driver supports low-resolution video modes, please
add SDL_GF_LOWRESOLUTION flag to the gf_devicename array in the SDL_qnxgf.c
source file.

-------------------------
-- SDL Photon driver --
-------------------------

----------------------------
-- SDL HID input driver --
----------------------------
8 changes: 5 additions & 3 deletions configure.in
View file
Expand Up @@ -1705,6 +1705,7 @@ CheckOpenGLESQNX()
AC_MSG_RESULT($video_opengl)
if test x$video_opengl = xyes; then
AC_DEFINE(SDL_VIDEO_OPENGL_ES)
AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES)
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGLES_CM"
else
AC_MSG_CHECKING(for QNX OpenGL ES (CL) support)
Expand All @@ -1719,7 +1720,8 @@ CheckOpenGLESQNX()
AC_MSG_RESULT($video_opengl)
if test x$video_opengl = xyes; then
AC_DEFINE(SDL_VIDEO_OPENGL_ES)
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGLES_CL"
AC_DEFINE(SDL_VIDEO_RENDER_OGL_ES)
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGLES_CLS"
fi
fi
fi
Expand Down Expand Up @@ -2501,8 +2503,8 @@ case "$host" in

# Set up files for the audio library
if test x$enable_audio = xyes; then
AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO)
SOURCES="$SOURCES $srcdir/src/audio/nto/*.c"
AC_DEFINE(SDL_AUDIO_DRIVER_QSA)
SOURCES="$SOURCES $srcdir/src/audio/qsa/*.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound"
have_audio=yes
fi
Expand Down
2 changes: 1 addition & 1 deletion include/SDL_config.h.in
View file
Expand Up @@ -193,7 +193,7 @@
#undef SDL_AUDIO_DRIVER_OSS
#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
#undef SDL_AUDIO_DRIVER_PAUDIO
#undef SDL_AUDIO_DRIVER_QNXNTO
#undef SDL_AUDIO_DRIVER_QSA
#undef SDL_AUDIO_DRIVER_SNDMGR
#undef SDL_AUDIO_DRIVER_SUNAUDIO
#undef SDL_AUDIO_DRIVER_WINWAVEOUT
Expand Down
6 changes: 6 additions & 0 deletions include/SDL_opengles.h
View file
Expand Up @@ -962,6 +962,12 @@ extern "C"
const GLvoid * pointer);
#endif

/* GL_OES_query_matrix */
#ifndef GL_OES_query_matrix
#define GL_OES_query_matrix 1
GL_API GLbitfield GL_APIENTRY glQueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
#endif /* GL_OES_query_matrix */

/* GL_OES_point_sprite */
#ifndef GL_OES_point_sprite
#define GL_OES_point_sprite 1
Expand Down
6 changes: 3 additions & 3 deletions src/audio/SDL_audio.c
View file
Expand Up @@ -49,7 +49,7 @@ extern AudioBootStrap DSP_bootstrap;
extern AudioBootStrap DMA_bootstrap;
extern AudioBootStrap ALSA_bootstrap;
extern AudioBootStrap PULSEAUDIO_bootstrap;
extern AudioBootStrap QNXNTOAUDIO_bootstrap;
extern AudioBootStrap QSAAUDIO_bootstrap;
extern AudioBootStrap SUNAUDIO_bootstrap;
extern AudioBootStrap DMEDIA_bootstrap;
extern AudioBootStrap ARTS_bootstrap;
Expand Down Expand Up @@ -91,8 +91,8 @@ static AudioBootStrap *bootstrap[] = {
&DSP_bootstrap,
&DMA_bootstrap,
#endif
#if SDL_AUDIO_DRIVER_QNXNTO
&QNXNTOAUDIO_bootstrap,
#if SDL_AUDIO_DRIVER_QSA
&QSAAUDIO_bootstrap,
#endif
#if SDL_AUDIO_DRIVER_SUNAUDIO
&SUNAUDIO_bootstrap,
Expand Down

0 comments on commit 00f5d0d

Please sign in to comment.