2008-09-02 00:37:04 +00:00
|
|
|
/*
|
|
|
|
SDL - Simple DirectMedia Layer
|
2008-12-08 00:27:32 +00:00
|
|
|
Copyright (C) 1997-2009 Sam Lantinga
|
2008-09-02 00:37:04 +00:00
|
|
|
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
License along with this library; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
|
|
|
|
Sam Lantinga
|
|
|
|
slouken@libsdl.org
|
|
|
|
*/
|
|
|
|
#include "SDL_config.h"
|
|
|
|
|
|
|
|
#if SDL_VIDEO_RENDER_OGL_ES
|
|
|
|
|
|
|
|
#include "SDL_video.h"
|
|
|
|
#include "SDL_opengles.h"
|
|
|
|
#include "SDL_sysvideo.h"
|
|
|
|
#include "SDL_pixels_c.h"
|
|
|
|
#include "SDL_rect_c.h"
|
|
|
|
#include "SDL_yuv_sw_c.h"
|
|
|
|
|
Date: Mon, 23 Mar 2009 09:17:24 +0200
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.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403566
2009-03-24 10:33:12 +00:00
|
|
|
#ifdef __QNXNTO__
|
|
|
|
|
|
|
|
/* Empty function stub to get OpenGL ES 1.0 support without */
|
|
|
|
/* OpenGL ES extension GL_OES_draw_texture_supported */
|
2009-05-23 22:41:08 +00:00
|
|
|
GL_API void GL_APIENTRY
|
|
|
|
glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
|
Date: Mon, 23 Mar 2009 09:17:24 +0200
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.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403566
2009-03-24 10:33:12 +00:00
|
|
|
{
|
2009-05-23 22:41:08 +00:00
|
|
|
return;
|
Date: Mon, 23 Mar 2009 09:17:24 +0200
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.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403566
2009-03-24 10:33:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* __QNXNTO__ */
|
|
|
|
|
2009-05-31 11:53:12 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_PANDORA
|
|
|
|
GL_API void GL_APIENTRY
|
|
|
|
glDrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif /* SDL_VIDEO_DRIVER_PANDORA */
|
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
/* OpenGL ES 1.1 renderer implementation, based on the OpenGL renderer */
|
|
|
|
|
|
|
|
static const float inv255f = 1.0f / 255.0f;
|
|
|
|
|
|
|
|
static SDL_Renderer *GLES_CreateRenderer(SDL_Window * window, Uint32 flags);
|
|
|
|
static int GLES_ActivateRenderer(SDL_Renderer * renderer);
|
|
|
|
static int GLES_DisplayModeChanged(SDL_Renderer * renderer);
|
|
|
|
static int GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
|
|
|
|
static int GLES_QueryTexturePixels(SDL_Renderer * renderer,
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Texture * texture, void **pixels,
|
|
|
|
int *pitch);
|
2008-09-02 00:37:04 +00:00
|
|
|
static int GLES_SetTexturePalette(SDL_Renderer * renderer,
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Texture * texture,
|
|
|
|
const SDL_Color * colors, int firstcolor,
|
|
|
|
int ncolors);
|
2008-09-02 00:37:04 +00:00
|
|
|
static int GLES_GetTexturePalette(SDL_Renderer * renderer,
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Texture * texture, SDL_Color * colors,
|
|
|
|
int firstcolor, int ncolors);
|
2008-09-02 00:37:04 +00:00
|
|
|
static int GLES_SetTextureColorMod(SDL_Renderer * renderer,
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Texture * texture);
|
2008-09-02 00:37:04 +00:00
|
|
|
static int GLES_SetTextureAlphaMod(SDL_Renderer * renderer,
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Texture * texture);
|
2008-09-02 00:37:04 +00:00
|
|
|
static int GLES_SetTextureBlendMode(SDL_Renderer * renderer,
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Texture * texture);
|
2008-09-02 00:37:04 +00:00
|
|
|
static int GLES_SetTextureScaleMode(SDL_Renderer * renderer,
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Texture * texture);
|
2008-09-02 00:37:04 +00:00
|
|
|
static int GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
|
2008-09-15 04:32:36 +00:00
|
|
|
const SDL_Rect * rect, const void *pixels,
|
|
|
|
int pitch);
|
2008-09-02 00:37:04 +00:00
|
|
|
static int GLES_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
|
2008-09-15 04:32:36 +00:00
|
|
|
const SDL_Rect * rect, int markDirty,
|
|
|
|
void **pixels, int *pitch);
|
|
|
|
static void GLES_UnlockTexture(SDL_Renderer * renderer,
|
|
|
|
SDL_Texture * texture);
|
2008-09-02 00:37:04 +00:00
|
|
|
static void GLES_DirtyTexture(SDL_Renderer * renderer, SDL_Texture * texture,
|
2008-09-15 04:32:36 +00:00
|
|
|
int numrects, const SDL_Rect * rects);
|
2008-12-31 07:56:56 +00:00
|
|
|
static int GLES_RenderPoint(SDL_Renderer * renderer, int x, int y);
|
|
|
|
static int GLES_RenderLine(SDL_Renderer * renderer, int x1, int y1, int x2,
|
|
|
|
int y2);
|
|
|
|
static int GLES_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect);
|
2008-09-02 00:37:04 +00:00
|
|
|
static int GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
|
2008-09-15 04:32:36 +00:00
|
|
|
const SDL_Rect * srcrect,
|
|
|
|
const SDL_Rect * dstrect);
|
2008-09-02 00:37:04 +00:00
|
|
|
static void GLES_RenderPresent(SDL_Renderer * renderer);
|
2008-09-15 04:32:36 +00:00
|
|
|
static void GLES_DestroyTexture(SDL_Renderer * renderer,
|
|
|
|
SDL_Texture * texture);
|
2008-09-02 00:37:04 +00:00
|
|
|
static void GLES_DestroyRenderer(SDL_Renderer * renderer);
|
|
|
|
|
|
|
|
|
|
|
|
SDL_RenderDriver GL_ES_RenderDriver = {
|
|
|
|
GLES_CreateRenderer,
|
|
|
|
{
|
|
|
|
"opengl_es",
|
|
|
|
(SDL_RENDERER_SINGLEBUFFER | SDL_RENDERER_PRESENTDISCARD |
|
|
|
|
SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_ACCELERATED),
|
|
|
|
(SDL_TEXTUREMODULATE_NONE | SDL_TEXTUREMODULATE_COLOR |
|
|
|
|
SDL_TEXTUREMODULATE_ALPHA),
|
Date: Fri, 19 Dec 2008 20:17:35 +0100
From: Couriersud
Subject: Re: Aw: Experience using SDL1.3 in sdlmame/Proposal for api additions
> For consistency you'd probably want:
> SDL_SetRenderDrawColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
> SDL_SetRenderDrawBlendMode(SDL_BlendMode blendMode);
> SDL_RenderLine(int x1, int y1, int x2, int y2);
> SDL_RenderFill(SDL_Rect *rect);
>
> You probably also want to add API functions query the current state.
>
I have implemented the above api for the opengl, x11, directfb and
software renderers. I have also renamed *TEXTUREBLENDMODE* constants to
BLENDMODE*. The unix build compiles. The windows renderer still needs to
be updated, but I have no windows development machine at hand. Have a
look at the x11 renderer for a sample.
Vector games now run at 90% both on opengl and directfb in comparison to
sdlmame's own opengl renderer. The same applies to raster games.
The diff also includes
a) Changed XDrawRect to XFillRect in x11 renderer
b) A number of changes to fix blending and modulation issues in the
directfb renderer.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403346
2008-12-20 12:00:00 +00:00
|
|
|
(SDL_BLENDMODE_NONE | SDL_BLENDMODE_MASK |
|
|
|
|
SDL_BLENDMODE_BLEND | SDL_BLENDMODE_ADD | SDL_BLENDMODE_MOD),
|
2008-09-02 00:37:04 +00:00
|
|
|
(SDL_TEXTURESCALEMODE_NONE | SDL_TEXTURESCALEMODE_FAST |
|
|
|
|
SDL_TEXTURESCALEMODE_SLOW), 2,
|
2008-09-15 04:32:36 +00:00
|
|
|
{
|
2009-05-14 10:54:34 +00:00
|
|
|
/* OpenGL ES 1.x supported formats list */
|
|
|
|
SDL_PIXELFORMAT_BGR24,
|
2009-05-23 22:41:08 +00:00
|
|
|
SDL_PIXELFORMAT_ABGR8888},
|
2008-09-15 04:32:36 +00:00
|
|
|
0,
|
2008-09-02 00:37:04 +00:00
|
|
|
0}
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
SDL_GLContext context;
|
|
|
|
SDL_bool updateSize;
|
|
|
|
int blendMode;
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
#ifndef APIENTRY
|
|
|
|
#define APIENTRY
|
|
|
|
#endif
|
2008-09-15 04:32:36 +00:00
|
|
|
|
|
|
|
SDL_bool useDrawTexture;
|
|
|
|
SDL_bool GL_OES_draw_texture_supported;
|
|
|
|
|
|
|
|
/* OpenGL ES functions */
|
|
|
|
#define SDL_PROC(ret,func,params) ret (APIENTRY *func) params;
|
|
|
|
#include "SDL_glesfuncs.h"
|
|
|
|
#undef SDL_PROC
|
2008-09-02 00:37:04 +00:00
|
|
|
|
|
|
|
} GLES_RenderData;
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
GLuint texture;
|
|
|
|
GLenum type;
|
|
|
|
GLfloat texw;
|
|
|
|
GLfloat texh;
|
|
|
|
GLenum format;
|
|
|
|
GLenum formattype;
|
|
|
|
void *pixels;
|
|
|
|
int pitch;
|
|
|
|
SDL_DirtyRectList dirty;
|
|
|
|
} GLES_TextureData;
|
|
|
|
|
|
|
|
static void
|
|
|
|
GLES_SetError(const char *prefix, GLenum result)
|
|
|
|
{
|
|
|
|
const char *error;
|
|
|
|
|
|
|
|
switch (result) {
|
|
|
|
case GL_NO_ERROR:
|
|
|
|
error = "GL_NO_ERROR";
|
|
|
|
break;
|
|
|
|
case GL_INVALID_ENUM:
|
|
|
|
error = "GL_INVALID_ENUM";
|
|
|
|
break;
|
|
|
|
case GL_INVALID_VALUE:
|
|
|
|
error = "GL_INVALID_VALUE";
|
|
|
|
break;
|
|
|
|
case GL_INVALID_OPERATION:
|
|
|
|
error = "GL_INVALID_OPERATION";
|
|
|
|
break;
|
|
|
|
case GL_STACK_OVERFLOW:
|
|
|
|
error = "GL_STACK_OVERFLOW";
|
|
|
|
break;
|
|
|
|
case GL_STACK_UNDERFLOW:
|
|
|
|
error = "GL_STACK_UNDERFLOW";
|
|
|
|
break;
|
|
|
|
case GL_OUT_OF_MEMORY:
|
|
|
|
error = "GL_OUT_OF_MEMORY";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
error = "UNKNOWN";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
SDL_SetError("%s: %s", prefix, error);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_LoadFunctions(GLES_RenderData * data)
|
|
|
|
{
|
2008-09-15 04:32:36 +00:00
|
|
|
|
|
|
|
#define SDL_PROC(ret,func,params) \
|
2009-05-14 10:54:34 +00:00
|
|
|
data->func = func;
|
2008-09-15 04:32:36 +00:00
|
|
|
#include "SDL_glesfuncs.h"
|
|
|
|
#undef SDL_PROC
|
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
GLES_AddRenderDriver(_THIS)
|
|
|
|
{
|
|
|
|
if (_this->GL_CreateContext) {
|
|
|
|
SDL_AddRenderDriver(0, &GL_ES_RenderDriver);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
SDL_Renderer *
|
|
|
|
GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
|
|
|
|
{
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
SDL_Renderer *renderer;
|
|
|
|
GLES_RenderData *data;
|
|
|
|
GLint value;
|
|
|
|
int doublebuffer;
|
|
|
|
|
|
|
|
if (!(window->flags & SDL_WINDOW_OPENGL)) {
|
|
|
|
if (SDL_RecreateWindow(window, window->flags | SDL_WINDOW_OPENGL) < 0) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));
|
|
|
|
if (!renderer) {
|
|
|
|
SDL_OutOfMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
data = (GLES_RenderData *) SDL_calloc(1, sizeof(*data));
|
|
|
|
if (!data) {
|
|
|
|
GLES_DestroyRenderer(renderer);
|
|
|
|
SDL_OutOfMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
renderer->ActivateRenderer = GLES_ActivateRenderer;
|
|
|
|
renderer->DisplayModeChanged = GLES_DisplayModeChanged;
|
|
|
|
renderer->CreateTexture = GLES_CreateTexture;
|
|
|
|
renderer->QueryTexturePixels = GLES_QueryTexturePixels;
|
|
|
|
renderer->SetTexturePalette = GLES_SetTexturePalette;
|
|
|
|
renderer->GetTexturePalette = GLES_GetTexturePalette;
|
|
|
|
renderer->SetTextureColorMod = GLES_SetTextureColorMod;
|
|
|
|
renderer->SetTextureAlphaMod = GLES_SetTextureAlphaMod;
|
|
|
|
renderer->SetTextureBlendMode = GLES_SetTextureBlendMode;
|
|
|
|
renderer->SetTextureScaleMode = GLES_SetTextureScaleMode;
|
|
|
|
renderer->UpdateTexture = GLES_UpdateTexture;
|
|
|
|
renderer->LockTexture = GLES_LockTexture;
|
|
|
|
renderer->UnlockTexture = GLES_UnlockTexture;
|
|
|
|
renderer->DirtyTexture = GLES_DirtyTexture;
|
2008-12-31 07:56:56 +00:00
|
|
|
renderer->RenderPoint = GLES_RenderPoint;
|
|
|
|
renderer->RenderLine = GLES_RenderLine;
|
2008-09-02 00:37:04 +00:00
|
|
|
renderer->RenderFill = GLES_RenderFill;
|
|
|
|
renderer->RenderCopy = GLES_RenderCopy;
|
|
|
|
renderer->RenderPresent = GLES_RenderPresent;
|
|
|
|
renderer->DestroyTexture = GLES_DestroyTexture;
|
|
|
|
renderer->DestroyRenderer = GLES_DestroyRenderer;
|
|
|
|
renderer->info = GL_ES_RenderDriver.info;
|
|
|
|
renderer->window = window->id;
|
|
|
|
renderer->driverdata = data;
|
2008-09-15 04:32:36 +00:00
|
|
|
|
|
|
|
|
|
|
|
renderer->info.flags =
|
|
|
|
(SDL_RENDERER_PRESENTDISCARD | SDL_RENDERER_ACCELERATED);
|
2008-09-02 00:37:04 +00:00
|
|
|
|
|
|
|
if (GLES_LoadFunctions(data) < 0) {
|
|
|
|
GLES_DestroyRenderer(renderer);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
data->context = SDL_GL_CreateContext(window->id);
|
|
|
|
if (!data->context) {
|
|
|
|
GLES_DestroyRenderer(renderer);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (SDL_GL_MakeCurrent(window->id, data->context) < 0) {
|
|
|
|
GLES_DestroyRenderer(renderer);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flags & SDL_RENDERER_PRESENTVSYNC) {
|
|
|
|
SDL_GL_SetSwapInterval(1);
|
|
|
|
} else {
|
|
|
|
SDL_GL_SetSwapInterval(0);
|
|
|
|
}
|
|
|
|
if (SDL_GL_GetSwapInterval() > 0) {
|
|
|
|
renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &doublebuffer) == 0) {
|
|
|
|
if (!doublebuffer) {
|
|
|
|
renderer->info.flags |= SDL_RENDERER_SINGLEBUFFER;
|
|
|
|
}
|
|
|
|
}
|
2009-05-31 11:53:12 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_PANDORA
|
|
|
|
data->GL_OES_draw_texture_supported = SDL_FALSE;
|
|
|
|
data->useDrawTexture = SDL_FALSE;
|
|
|
|
#else
|
2008-09-15 04:32:36 +00:00
|
|
|
if (SDL_GL_ExtensionSupported("GL_OES_draw_texture")) {
|
|
|
|
data->GL_OES_draw_texture_supported = SDL_TRUE;
|
|
|
|
data->useDrawTexture = SDL_TRUE;
|
|
|
|
} else {
|
|
|
|
data->GL_OES_draw_texture_supported = SDL_FALSE;
|
|
|
|
data->useDrawTexture = SDL_FALSE;
|
|
|
|
}
|
2009-05-31 11:53:12 +00:00
|
|
|
#endif
|
2008-09-02 00:37:04 +00:00
|
|
|
|
|
|
|
data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
|
|
|
|
renderer->info.max_texture_width = value;
|
|
|
|
data->glGetIntegerv(GL_MAX_TEXTURE_SIZE, &value);
|
|
|
|
renderer->info.max_texture_height = value;
|
|
|
|
|
|
|
|
/* Set up parameters for rendering */
|
|
|
|
data->blendMode = -1;
|
|
|
|
data->glDisable(GL_DEPTH_TEST);
|
|
|
|
data->glDisable(GL_CULL_FACE);
|
|
|
|
data->updateSize = SDL_TRUE;
|
|
|
|
|
|
|
|
return renderer;
|
|
|
|
}
|
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
static int
|
|
|
|
GLES_ActivateRenderer(SDL_Renderer * renderer)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
2008-09-15 04:32:36 +00:00
|
|
|
|
|
|
|
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
|
2008-09-02 00:37:04 +00:00
|
|
|
SDL_Window *window = SDL_GetWindowFromID(renderer->window);
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
if (SDL_GL_MakeCurrent(window->id, data->context) < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (data->updateSize) {
|
|
|
|
data->glMatrixMode(GL_PROJECTION);
|
|
|
|
data->glLoadIdentity();
|
|
|
|
data->glMatrixMode(GL_MODELVIEW);
|
|
|
|
data->glLoadIdentity();
|
|
|
|
data->glViewport(0, 0, window->w, window->h);
|
2008-09-15 04:32:36 +00:00
|
|
|
data->glOrthof(0.0, (GLfloat) window->w, (GLfloat) window->h, 0.0,
|
|
|
|
0.0, 1.0);
|
2008-09-02 00:37:04 +00:00
|
|
|
data->updateSize = SDL_FALSE;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_DisplayModeChanged(SDL_Renderer * renderer)
|
|
|
|
{
|
|
|
|
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
|
|
|
|
|
|
|
|
data->updateSize = SDL_TRUE;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static __inline__ int
|
|
|
|
power_of_2(int input)
|
|
|
|
{
|
|
|
|
int value = 1;
|
|
|
|
|
|
|
|
while (value < input) {
|
|
|
|
value <<= 1;
|
|
|
|
}
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-05-23 22:41:08 +00:00
|
|
|
GLES_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
|
|
|
GLES_RenderData *renderdata = (GLES_RenderData *) renderer->driverdata;
|
|
|
|
SDL_Window *window = SDL_GetWindowFromID(renderer->window);
|
|
|
|
GLES_TextureData *data;
|
|
|
|
GLint internalFormat;
|
|
|
|
GLenum format, type;
|
|
|
|
int texture_w, texture_h;
|
|
|
|
GLenum result;
|
Date: Mon, 23 Mar 2009 09:17:24 +0200
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.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403566
2009-03-24 10:33:12 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
switch (texture->format) {
|
|
|
|
case SDL_PIXELFORMAT_BGR24:
|
2009-05-23 22:41:08 +00:00
|
|
|
internalFormat = GL_RGB;
|
|
|
|
format = GL_RGB;
|
|
|
|
type = GL_UNSIGNED_BYTE;
|
|
|
|
break;
|
2008-09-15 04:32:36 +00:00
|
|
|
case SDL_PIXELFORMAT_ABGR8888:
|
2009-05-23 22:41:08 +00:00
|
|
|
internalFormat = GL_RGBA;
|
|
|
|
format = GL_RGBA;
|
|
|
|
type = GL_UNSIGNED_BYTE;
|
|
|
|
break;
|
2008-09-15 04:32:36 +00:00
|
|
|
/*
|
|
|
|
These formats would be supported if SDL had the necessary pixel formats
|
|
|
|
case SDL_PIXELFORMAT_BGR565:
|
|
|
|
internalFormat = GL_RGB;
|
|
|
|
format = GL_RGB;
|
|
|
|
type = GL_UNSIGNED_SHORT_5_6_5;
|
|
|
|
break;
|
|
|
|
case SDL_PIXELFORMAT_ABGR5551:
|
|
|
|
internalFormat = GL_RGBA;
|
|
|
|
format = GL_RGBA;
|
|
|
|
type = GL_UNSIGNED_SHORT_5_5_5_1;
|
|
|
|
break;
|
|
|
|
case SDL_PIXELFORMAT_ABGR4444:
|
|
|
|
internalFormat = GL_RGBA;
|
|
|
|
format = GL_RGBA;
|
|
|
|
type = GL_UNSIGNED_SHORT_4_4_4_4;
|
|
|
|
break;
|
2009-05-23 22:41:08 +00:00
|
|
|
*/
|
2008-09-15 04:32:36 +00:00
|
|
|
default:
|
|
|
|
SDL_SetError("Unsupported texture format");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
data = (GLES_TextureData *) SDL_calloc(1, sizeof(*data));
|
2008-09-02 00:37:04 +00:00
|
|
|
if (!data) {
|
|
|
|
SDL_OutOfMemory();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (texture->access == SDL_TEXTUREACCESS_STREAMING) {
|
|
|
|
data->pitch = texture->w * SDL_BYTESPERPIXEL(texture->format);
|
|
|
|
data->pixels = SDL_malloc(texture->h * data->pitch);
|
|
|
|
if (!data->pixels) {
|
|
|
|
SDL_OutOfMemory();
|
|
|
|
SDL_free(data);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
texture->driverdata = data;
|
|
|
|
|
|
|
|
renderdata->glGetError();
|
2009-05-14 10:54:34 +00:00
|
|
|
renderdata->glEnable(GL_TEXTURE_2D);
|
2008-09-02 00:37:04 +00:00
|
|
|
renderdata->glGenTextures(1, &data->texture);
|
2008-09-15 04:32:36 +00:00
|
|
|
|
|
|
|
data->type = GL_TEXTURE_2D;
|
|
|
|
/* no NPOV textures allowed in OpenGL ES (yet) */
|
|
|
|
texture_w = power_of_2(texture->w);
|
|
|
|
texture_h = power_of_2(texture->h);
|
|
|
|
data->texw = (GLfloat) texture->w / texture_w;
|
|
|
|
data->texh = (GLfloat) texture->h / texture_h;
|
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
data->format = format;
|
|
|
|
data->formattype = type;
|
|
|
|
renderdata->glBindTexture(data->type, data->texture);
|
|
|
|
renderdata->glTexParameteri(data->type, GL_TEXTURE_MIN_FILTER,
|
|
|
|
GL_NEAREST);
|
|
|
|
renderdata->glTexParameteri(data->type, GL_TEXTURE_MAG_FILTER,
|
|
|
|
GL_NEAREST);
|
|
|
|
renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_S,
|
|
|
|
GL_CLAMP_TO_EDGE);
|
|
|
|
renderdata->glTexParameteri(data->type, GL_TEXTURE_WRAP_T,
|
|
|
|
GL_CLAMP_TO_EDGE);
|
2008-09-15 04:32:36 +00:00
|
|
|
|
|
|
|
renderdata->glTexImage2D(data->type, 0, internalFormat, texture_w,
|
|
|
|
texture_h, 0, format, type, NULL);
|
2009-05-14 10:54:34 +00:00
|
|
|
renderdata->glDisable(GL_TEXTURE_2D);
|
2008-09-02 00:37:04 +00:00
|
|
|
|
|
|
|
result = renderdata->glGetError();
|
|
|
|
if (result != GL_NO_ERROR) {
|
|
|
|
GLES_SetError("glTexImage2D()", result);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_QueryTexturePixels(SDL_Renderer * renderer, SDL_Texture * texture,
|
2008-09-15 04:32:36 +00:00
|
|
|
void **pixels, int *pitch)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
|
|
|
GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
|
|
|
|
|
|
|
|
*pixels = data->pixels;
|
|
|
|
*pitch = data->pitch;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_SetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture,
|
2008-09-15 04:32:36 +00:00
|
|
|
const SDL_Color * colors, int firstcolor, int ncolors)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_SetError("OpenGL ES does not support paletted textures");
|
2008-09-02 00:37:04 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_GetTexturePalette(SDL_Renderer * renderer, SDL_Texture * texture,
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Color * colors, int firstcolor, int ncolors)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_SetError("OpenGL ES does not support paletted textures");
|
2008-09-02 00:37:04 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
SetupTextureUpdate(GLES_RenderData * renderdata, SDL_Texture * texture,
|
|
|
|
int pitch)
|
|
|
|
{
|
2008-09-15 04:32:36 +00:00
|
|
|
GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
|
|
|
|
renderdata->glBindTexture(data->type, data->texture);
|
2008-09-02 00:37:04 +00:00
|
|
|
renderdata->glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_SetTextureColorMod(SDL_Renderer * renderer, SDL_Texture * texture)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_SetTextureAlphaMod(SDL_Renderer * renderer, SDL_Texture * texture)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture)
|
|
|
|
{
|
|
|
|
switch (texture->blendMode) {
|
Date: Fri, 19 Dec 2008 20:17:35 +0100
From: Couriersud
Subject: Re: Aw: Experience using SDL1.3 in sdlmame/Proposal for api additions
> For consistency you'd probably want:
> SDL_SetRenderDrawColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
> SDL_SetRenderDrawBlendMode(SDL_BlendMode blendMode);
> SDL_RenderLine(int x1, int y1, int x2, int y2);
> SDL_RenderFill(SDL_Rect *rect);
>
> You probably also want to add API functions query the current state.
>
I have implemented the above api for the opengl, x11, directfb and
software renderers. I have also renamed *TEXTUREBLENDMODE* constants to
BLENDMODE*. The unix build compiles. The windows renderer still needs to
be updated, but I have no windows development machine at hand. Have a
look at the x11 renderer for a sample.
Vector games now run at 90% both on opengl and directfb in comparison to
sdlmame's own opengl renderer. The same applies to raster games.
The diff also includes
a) Changed XDrawRect to XFillRect in x11 renderer
b) A number of changes to fix blending and modulation issues in the
directfb renderer.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403346
2008-12-20 12:00:00 +00:00
|
|
|
case SDL_BLENDMODE_NONE:
|
|
|
|
case SDL_BLENDMODE_MASK:
|
|
|
|
case SDL_BLENDMODE_BLEND:
|
|
|
|
case SDL_BLENDMODE_ADD:
|
|
|
|
case SDL_BLENDMODE_MOD:
|
2008-09-02 00:37:04 +00:00
|
|
|
return 0;
|
|
|
|
default:
|
|
|
|
SDL_Unsupported();
|
Date: Fri, 19 Dec 2008 20:17:35 +0100
From: Couriersud
Subject: Re: Aw: Experience using SDL1.3 in sdlmame/Proposal for api additions
> For consistency you'd probably want:
> SDL_SetRenderDrawColor(Uint8 r, Uint8 g, Uint8 b, Uint8 a);
> SDL_SetRenderDrawBlendMode(SDL_BlendMode blendMode);
> SDL_RenderLine(int x1, int y1, int x2, int y2);
> SDL_RenderFill(SDL_Rect *rect);
>
> You probably also want to add API functions query the current state.
>
I have implemented the above api for the opengl, x11, directfb and
software renderers. I have also renamed *TEXTUREBLENDMODE* constants to
BLENDMODE*. The unix build compiles. The windows renderer still needs to
be updated, but I have no windows development machine at hand. Have a
look at the x11 renderer for a sample.
Vector games now run at 90% both on opengl and directfb in comparison to
sdlmame's own opengl renderer. The same applies to raster games.
The diff also includes
a) Changed XDrawRect to XFillRect in x11 renderer
b) A number of changes to fix blending and modulation issues in the
directfb renderer.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403346
2008-12-20 12:00:00 +00:00
|
|
|
texture->blendMode = SDL_BLENDMODE_NONE;
|
2008-09-02 00:37:04 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_SetTextureScaleMode(SDL_Renderer * renderer, SDL_Texture * texture)
|
|
|
|
{
|
|
|
|
switch (texture->scaleMode) {
|
|
|
|
case SDL_TEXTURESCALEMODE_NONE:
|
|
|
|
case SDL_TEXTURESCALEMODE_FAST:
|
|
|
|
case SDL_TEXTURESCALEMODE_SLOW:
|
|
|
|
return 0;
|
|
|
|
case SDL_TEXTURESCALEMODE_BEST:
|
|
|
|
SDL_Unsupported();
|
2008-09-15 04:32:36 +00:00
|
|
|
texture->scaleMode = SDL_TEXTURESCALEMODE_SLOW;
|
2008-09-02 00:37:04 +00:00
|
|
|
return -1;
|
|
|
|
default:
|
|
|
|
SDL_Unsupported();
|
|
|
|
texture->scaleMode = SDL_TEXTURESCALEMODE_NONE;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-05-23 22:41:08 +00:00
|
|
|
GLES_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
const SDL_Rect * rect, const void *pixels, int pitch)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
|
|
|
GLES_RenderData *renderdata = (GLES_RenderData *) renderer->driverdata;
|
|
|
|
GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
|
|
|
|
GLenum result;
|
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
renderdata->glGetError();
|
2009-05-14 10:54:34 +00:00
|
|
|
renderdata->glEnable(data->type);
|
|
|
|
SetupTextureUpdate(renderdata, texture, pitch);
|
2008-09-15 04:32:36 +00:00
|
|
|
renderdata->glTexSubImage2D(data->type, 0, rect->x, rect->y, rect->w,
|
2008-09-02 00:37:04 +00:00
|
|
|
rect->h, data->format, data->formattype,
|
|
|
|
pixels);
|
2009-05-14 10:54:34 +00:00
|
|
|
renderdata->glDisable(data->type);
|
2008-09-02 00:37:04 +00:00
|
|
|
result = renderdata->glGetError();
|
|
|
|
if (result != GL_NO_ERROR) {
|
|
|
|
GLES_SetError("glTexSubImage2D()", result);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture,
|
2008-09-15 04:32:36 +00:00
|
|
|
const SDL_Rect * rect, int markDirty, void **pixels,
|
|
|
|
int *pitch)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
|
|
|
GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
|
|
|
|
|
|
|
|
if (markDirty) {
|
|
|
|
SDL_AddDirtyRect(&data->dirty, rect);
|
|
|
|
}
|
|
|
|
|
|
|
|
*pixels =
|
|
|
|
(void *) ((Uint8 *) data->pixels + rect->y * data->pitch +
|
|
|
|
rect->x * SDL_BYTESPERPIXEL(texture->format));
|
|
|
|
*pitch = data->pitch;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
GLES_UnlockTexture(SDL_Renderer * renderer, SDL_Texture * texture)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2008-09-15 04:32:36 +00:00
|
|
|
GLES_DirtyTexture(SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
int numrects, const SDL_Rect * rects)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
|
|
|
GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < numrects; ++i) {
|
|
|
|
SDL_AddDirtyRect(&data->dirty, &rects[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-12-31 07:56:56 +00:00
|
|
|
static void
|
|
|
|
GLES_SetBlendMode(GLES_RenderData * data, int blendMode)
|
|
|
|
{
|
|
|
|
if (blendMode != data->blendMode) {
|
|
|
|
switch (blendMode) {
|
|
|
|
case SDL_BLENDMODE_NONE:
|
|
|
|
data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
|
|
|
|
data->glDisable(GL_BLEND);
|
|
|
|
break;
|
|
|
|
case SDL_BLENDMODE_MASK:
|
|
|
|
case SDL_BLENDMODE_BLEND:
|
|
|
|
data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
|
|
|
|
data->glEnable(GL_BLEND);
|
|
|
|
data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
|
|
break;
|
|
|
|
case SDL_BLENDMODE_ADD:
|
|
|
|
data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
|
|
|
|
data->glEnable(GL_BLEND);
|
|
|
|
data->glBlendFunc(GL_SRC_ALPHA, GL_ONE);
|
|
|
|
break;
|
|
|
|
case SDL_BLENDMODE_MOD:
|
|
|
|
data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
|
|
|
|
data->glEnable(GL_BLEND);
|
|
|
|
data->glBlendFunc(GL_ZERO, GL_SRC_COLOR);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
data->blendMode = blendMode;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
static int
|
2008-12-31 07:56:56 +00:00
|
|
|
GLES_RenderPoint(SDL_Renderer * renderer, int x, int y)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
2008-12-31 07:56:56 +00:00
|
|
|
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
|
|
|
|
|
|
|
|
GLES_SetBlendMode(data, renderer->blendMode);
|
|
|
|
|
|
|
|
data->glColor4f((GLfloat) renderer->r * inv255f,
|
|
|
|
(GLfloat) renderer->g * inv255f,
|
|
|
|
(GLfloat) renderer->b * inv255f,
|
|
|
|
(GLfloat) renderer->a * inv255f);
|
|
|
|
|
2009-01-02 16:03:37 +00:00
|
|
|
GLshort vertices[2];
|
|
|
|
vertices[0] = x;
|
|
|
|
vertices[1] = y;
|
|
|
|
|
|
|
|
data->glVertexPointer(2, GL_SHORT, 0, vertices);
|
|
|
|
data->glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
data->glDrawArrays(GL_POINTS, 0, 1);
|
|
|
|
data->glDisableClientState(GL_VERTEX_ARRAY);
|
|
|
|
|
2009-05-14 10:54:34 +00:00
|
|
|
data->glDisable(GL_BLEND);
|
|
|
|
|
2008-12-31 07:56:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-12-31 07:56:56 +00:00
|
|
|
static int
|
|
|
|
GLES_RenderLine(SDL_Renderer * renderer, int x1, int y1, int x2, int y2)
|
|
|
|
{
|
2008-09-15 04:32:36 +00:00
|
|
|
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
|
|
|
|
|
2008-12-31 07:56:56 +00:00
|
|
|
GLES_SetBlendMode(data, renderer->blendMode);
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-12-31 07:56:56 +00:00
|
|
|
data->glColor4f((GLfloat) renderer->r * inv255f,
|
|
|
|
(GLfloat) renderer->g * inv255f,
|
|
|
|
(GLfloat) renderer->b * inv255f,
|
|
|
|
(GLfloat) renderer->a * inv255f);
|
|
|
|
|
2009-01-02 16:03:37 +00:00
|
|
|
GLshort vertices[4];
|
|
|
|
vertices[0] = x1;
|
|
|
|
vertices[1] = y1;
|
|
|
|
vertices[2] = x2;
|
|
|
|
vertices[3] = y2;
|
2009-01-01 23:47:33 +00:00
|
|
|
|
2009-01-02 16:03:37 +00:00
|
|
|
data->glVertexPointer(2, GL_SHORT, 0, vertices);
|
|
|
|
data->glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
data->glDrawArrays(GL_LINES, 0, 2);
|
|
|
|
data->glDisableClientState(GL_VERTEX_ARRAY);
|
2009-01-01 23:47:33 +00:00
|
|
|
|
2009-05-14 10:54:34 +00:00
|
|
|
data->glDisable(GL_BLEND);
|
|
|
|
|
2008-12-31 07:56:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-12-31 07:56:56 +00:00
|
|
|
static int
|
|
|
|
GLES_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect)
|
|
|
|
{
|
|
|
|
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-12-31 07:56:56 +00:00
|
|
|
GLES_SetBlendMode(data, renderer->blendMode);
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-12-31 07:56:56 +00:00
|
|
|
data->glColor4f((GLfloat) renderer->r * inv255f,
|
|
|
|
(GLfloat) renderer->g * inv255f,
|
|
|
|
(GLfloat) renderer->b * inv255f,
|
|
|
|
(GLfloat) renderer->a * inv255f);
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2009-01-02 16:03:37 +00:00
|
|
|
GLshort minx = rect->x;
|
|
|
|
GLshort maxx = rect->x + rect->w;
|
|
|
|
GLshort miny = rect->y;
|
|
|
|
GLshort maxy = rect->y + rect->h;
|
|
|
|
|
|
|
|
GLshort vertices[8];
|
|
|
|
vertices[0] = minx;
|
|
|
|
vertices[1] = miny;
|
|
|
|
vertices[2] = maxx;
|
|
|
|
vertices[3] = miny;
|
|
|
|
vertices[4] = minx;
|
|
|
|
vertices[5] = maxy;
|
|
|
|
vertices[6] = maxx;
|
|
|
|
vertices[7] = maxy;
|
|
|
|
|
|
|
|
data->glVertexPointer(2, GL_SHORT, 0, vertices);
|
|
|
|
data->glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
|
|
|
|
data->glDisableClientState(GL_VERTEX_ARRAY);
|
2009-01-01 23:47:33 +00:00
|
|
|
|
2009-05-14 10:54:34 +00:00
|
|
|
data->glDisable(GL_BLEND);
|
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
return 0;
|
2008-09-02 00:37:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
|
2008-09-15 04:32:36 +00:00
|
|
|
const SDL_Rect * srcrect, const SDL_Rect * dstrect)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
|
|
|
|
GLES_TextureData *texturedata = (GLES_TextureData *) texture->driverdata;
|
|
|
|
int minx, miny, maxx, maxy;
|
|
|
|
GLfloat minu, maxu, minv, maxv;
|
2008-09-15 04:32:36 +00:00
|
|
|
int i;
|
|
|
|
void *temp_buffer; /* used for reformatting dirty rect pixels */
|
|
|
|
void *temp_ptr;
|
|
|
|
|
2009-05-14 10:54:34 +00:00
|
|
|
data->glEnable(GL_TEXTURE_2D);
|
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
if (texturedata->dirty.list) {
|
|
|
|
SDL_DirtyRect *dirty;
|
|
|
|
void *pixels;
|
|
|
|
int bpp = SDL_BYTESPERPIXEL(texture->format);
|
|
|
|
int pitch = texturedata->pitch;
|
|
|
|
|
|
|
|
SetupTextureUpdate(data, texture, pitch);
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
data->glBindTexture(texturedata->type, texturedata->texture);
|
|
|
|
for (dirty = texturedata->dirty.list; dirty; dirty = dirty->next) {
|
|
|
|
SDL_Rect *rect = &dirty->rect;
|
2008-09-15 04:32:36 +00:00
|
|
|
pixels =
|
|
|
|
(void *) ((Uint8 *) texturedata->pixels + rect->y * pitch +
|
|
|
|
rect->x * bpp);
|
|
|
|
/* There is no GL_UNPACK_ROW_LENGTH in OpenGLES
|
|
|
|
we must do this reformatting ourselves(!)
|
|
|
|
|
|
|
|
maybe it'd be a good idea to keep a temp buffer around
|
|
|
|
for this purpose rather than allocating it each time
|
|
|
|
*/
|
|
|
|
temp_buffer = SDL_malloc(rect->w * rect->h * bpp);
|
|
|
|
temp_ptr = temp_buffer;
|
|
|
|
for (i = 0; i < rect->h; i++) {
|
|
|
|
SDL_memcpy(temp_ptr, pixels, rect->w * bpp);
|
|
|
|
temp_ptr += rect->w * bpp;
|
|
|
|
pixels += pitch;
|
|
|
|
}
|
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
data->glTexSubImage2D(texturedata->type, 0, rect->x, rect->y,
|
|
|
|
rect->w, rect->h, texturedata->format,
|
|
|
|
texturedata->formattype, temp_buffer);
|
2008-09-15 04:32:36 +00:00
|
|
|
|
|
|
|
SDL_free(temp_buffer);
|
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
}
|
|
|
|
SDL_ClearDirtyRects(&texturedata->dirty);
|
|
|
|
}
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
data->glBindTexture(texturedata->type, texturedata->texture);
|
2008-09-15 04:32:36 +00:00
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
if (texture->modMode) {
|
|
|
|
data->glColor4f((GLfloat) texture->r * inv255f,
|
|
|
|
(GLfloat) texture->g * inv255f,
|
|
|
|
(GLfloat) texture->b * inv255f,
|
|
|
|
(GLfloat) texture->a * inv255f);
|
|
|
|
} else {
|
|
|
|
data->glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
|
|
|
|
}
|
|
|
|
|
2008-12-31 07:56:56 +00:00
|
|
|
GLES_SetBlendMode(data, texture->blendMode);
|
2008-09-02 00:37:04 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
switch (texture->scaleMode) {
|
|
|
|
case SDL_TEXTURESCALEMODE_NONE:
|
|
|
|
case SDL_TEXTURESCALEMODE_FAST:
|
|
|
|
data->glTexParameteri(texturedata->type, GL_TEXTURE_MIN_FILTER,
|
|
|
|
GL_NEAREST);
|
|
|
|
data->glTexParameteri(texturedata->type, GL_TEXTURE_MAG_FILTER,
|
|
|
|
GL_NEAREST);
|
|
|
|
break;
|
|
|
|
case SDL_TEXTURESCALEMODE_SLOW:
|
|
|
|
case SDL_TEXTURESCALEMODE_BEST:
|
|
|
|
data->glTexParameteri(texturedata->type, GL_TEXTURE_MIN_FILTER,
|
|
|
|
GL_LINEAR);
|
|
|
|
data->glTexParameteri(texturedata->type, GL_TEXTURE_MAG_FILTER,
|
|
|
|
GL_LINEAR);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->GL_OES_draw_texture_supported && data->useDrawTexture) {
|
|
|
|
/* this code is a little funny because the viewport is upside down vs SDL's coordinate system */
|
|
|
|
SDL_Window *window = SDL_GetWindowFromID(renderer->window);
|
|
|
|
GLint cropRect[4];
|
|
|
|
cropRect[0] = srcrect->x;
|
|
|
|
cropRect[1] = srcrect->y + srcrect->h;
|
|
|
|
cropRect[2] = srcrect->w;
|
|
|
|
cropRect[3] = -srcrect->h;
|
|
|
|
data->glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES,
|
|
|
|
cropRect);
|
|
|
|
data->glDrawTexiOES(dstrect->x, window->h - dstrect->y - dstrect->h,
|
|
|
|
0, dstrect->w, dstrect->h);
|
|
|
|
} else {
|
|
|
|
|
|
|
|
minx = dstrect->x;
|
|
|
|
miny = dstrect->y;
|
|
|
|
maxx = dstrect->x + dstrect->w;
|
|
|
|
maxy = dstrect->y + dstrect->h;
|
|
|
|
|
|
|
|
minu = (GLfloat) srcrect->x / texture->w;
|
|
|
|
minu *= texturedata->texw;
|
|
|
|
maxu = (GLfloat) (srcrect->x + srcrect->w) / texture->w;
|
|
|
|
maxu *= texturedata->texw;
|
|
|
|
minv = (GLfloat) srcrect->y / texture->h;
|
|
|
|
minv *= texturedata->texh;
|
|
|
|
maxv = (GLfloat) (srcrect->y + srcrect->h) / texture->h;
|
|
|
|
maxv *= texturedata->texh;
|
|
|
|
|
|
|
|
GLshort vertices[8];
|
|
|
|
GLfloat texCoords[8];
|
|
|
|
|
|
|
|
vertices[0] = minx;
|
|
|
|
vertices[1] = miny;
|
|
|
|
vertices[2] = maxx;
|
|
|
|
vertices[3] = miny;
|
|
|
|
vertices[4] = minx;
|
|
|
|
vertices[5] = maxy;
|
|
|
|
vertices[6] = maxx;
|
|
|
|
vertices[7] = maxy;
|
|
|
|
|
|
|
|
texCoords[0] = minu;
|
|
|
|
texCoords[1] = minv;
|
|
|
|
texCoords[2] = maxu;
|
|
|
|
texCoords[3] = minv;
|
|
|
|
texCoords[4] = minu;
|
|
|
|
texCoords[5] = maxv;
|
|
|
|
texCoords[6] = maxu;
|
|
|
|
texCoords[7] = maxv;
|
|
|
|
|
|
|
|
data->glVertexPointer(2, GL_SHORT, 0, vertices);
|
|
|
|
data->glEnableClientState(GL_VERTEX_ARRAY);
|
|
|
|
data->glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
|
|
|
|
data->glEnableClientState(GL_TEXTURE_COORD_ARRAY);
|
|
|
|
data->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
|
2009-05-14 10:54:34 +00:00
|
|
|
data->glDisableClientState(GL_TEXTURE_COORD_ARRAY);
|
|
|
|
data->glDisableClientState(GL_VERTEX_ARRAY);
|
2008-09-15 04:32:36 +00:00
|
|
|
}
|
|
|
|
|
2009-05-14 10:54:34 +00:00
|
|
|
data->glDisable(GL_TEXTURE_2D);
|
|
|
|
|
2008-09-02 00:37:04 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2009-05-23 22:41:08 +00:00
|
|
|
GLES_RenderPresent(SDL_Renderer * renderer)
|
2008-09-02 00:37:04 +00:00
|
|
|
{
|
|
|
|
SDL_GL_SwapWindow(renderer->window);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
GLES_DestroyTexture(SDL_Renderer * renderer, SDL_Texture * texture)
|
|
|
|
{
|
|
|
|
GLES_RenderData *renderdata = (GLES_RenderData *) renderer->driverdata;
|
|
|
|
GLES_TextureData *data = (GLES_TextureData *) texture->driverdata;
|
|
|
|
|
|
|
|
if (!data) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (data->texture) {
|
2008-09-15 04:32:36 +00:00
|
|
|
glDeleteTextures(1, &data->texture);
|
2008-09-02 00:37:04 +00:00
|
|
|
}
|
|
|
|
if (data->pixels) {
|
|
|
|
SDL_free(data->pixels);
|
|
|
|
}
|
|
|
|
SDL_FreeDirtyRects(&data->dirty);
|
|
|
|
SDL_free(data);
|
|
|
|
texture->driverdata = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
GLES_DestroyRenderer(SDL_Renderer * renderer)
|
|
|
|
{
|
|
|
|
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
|
|
|
|
|
|
|
|
if (data) {
|
|
|
|
if (data->context) {
|
|
|
|
SDL_GL_DeleteContext(data->context);
|
|
|
|
}
|
|
|
|
SDL_free(data);
|
|
|
|
}
|
|
|
|
SDL_free(renderer);
|
|
|
|
}
|
|
|
|
|
Date: Mon, 23 Mar 2009 09:17:24 +0200
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.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403566
2009-03-24 10:33:12 +00:00
|
|
|
#endif /* SDL_VIDEO_RENDER_OGL_ES */
|
2008-09-02 00:37:04 +00:00
|
|
|
|
|
|
|
/* vi: set ts=4 sw=4 expandtab: */
|