2001-04-26 16:45:43 +00:00
|
|
|
/*
|
|
|
|
SDL - Simple DirectMedia Layer
|
2008-12-08 00:27:32 +00:00
|
|
|
Copyright (C) 1997-2009 Sam Lantinga
|
2001-04-26 16:45:43 +00:00
|
|
|
|
|
|
|
This library is free software; you can redistribute it and/or
|
2006-02-01 06:32:25 +00:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
2001-04-26 16:45:43 +00:00
|
|
|
License as published by the Free Software Foundation; either
|
2006-02-01 06:32:25 +00:00
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
2001-04-26 16:45:43 +00:00
|
|
|
|
|
|
|
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
|
2006-02-01 06:32:25 +00:00
|
|
|
Lesser General Public License for more details.
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2006-02-01 06:32:25 +00:00
|
|
|
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
|
2001-04-26 16:45:43 +00:00
|
|
|
|
|
|
|
Sam Lantinga
|
2001-12-14 12:38:15 +00:00
|
|
|
slouken@libsdl.org
|
2001-04-26 16:45:43 +00:00
|
|
|
*/
|
2006-02-21 08:46:50 +00:00
|
|
|
#include "SDL_config.h"
|
2001-04-26 16:45:43 +00:00
|
|
|
|
|
|
|
#ifndef _SDL_sysvideo_h
|
|
|
|
#define _SDL_sysvideo_h
|
|
|
|
|
|
|
|
#include "SDL_mouse.h"
|
Date: Thu, 05 Jul 2007 14:02:33 -0700
From: Sam Lantinga
Subject: SDL 1.3 keyboard plan
After lots of discussion with Christian, this is what we came up with:
> So, to sum up...
> SDLK_* become the physical keys, starting at > (1<<21)
> We create a macro SDLK_INDEX(X)
> We have two functions SDL_GetLayoutKey(SDLKey) and SDL_GetKeyName()
> SDL_GetLayoutKey maps to UCS4 for printable characters, and SDLK* for
non-printable characters
> and does so based on the OS's current keyboard layout
> SDL_GetKeyName() handles both SDLK_* and UCS4, converting UCS4 to UTF-8 and
converting SDLK_* into our names, which are UTF-8 for printable characters.
> WASD folks use SDLK_*, and 'I' folks use SDL_GetLayoutKey(SDLK_*)
Here is the patch he came up with, and his e-mail about it:
Date: Fri, 17 Aug 2007 19:50:28 +0200
From: Christian Walther
Subject: Re: SDL 1.3 keyboard plan
> Sounds great, go ahead and send me a patch.
Here goes! Thanks for having a look. Don't hesitate to comment if
anything does not conform to your ideas.
One caveat: Committing this now may break compilability of some video
drivers - specifically, if they use any of the SDLK_* codes that were
obsoleted and moved into SDL_compat.h. I only tried Cocoa (which did
break, but is already fixed) and X11 (which didn't, but then its key
handling is #iffed out). If that's a problem, it may need to go into
a branch.
-Christian
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402630
2007-08-19 14:52:52 +00:00
|
|
|
#include "SDL_keysym.h"
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
/* The SDL video driver */
|
|
|
|
|
|
|
|
typedef struct SDL_Window SDL_Window;
|
|
|
|
typedef struct SDL_Texture SDL_Texture;
|
|
|
|
typedef struct SDL_Renderer SDL_Renderer;
|
|
|
|
typedef struct SDL_RenderDriver SDL_RenderDriver;
|
|
|
|
typedef struct SDL_VideoDisplay SDL_VideoDisplay;
|
|
|
|
typedef struct SDL_VideoDevice SDL_VideoDevice;
|
|
|
|
|
|
|
|
/* Define the SDL texture structure */
|
2008-09-15 04:32:36 +00:00
|
|
|
struct SDL_Texture
|
|
|
|
{
|
|
|
|
Uint32 id;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
Uint32 format; /**< The pixel format of the texture */
|
|
|
|
int access; /**< SDL_TextureAccess */
|
|
|
|
int w; /**< The width of the texture */
|
|
|
|
int h; /**< The height of the texture */
|
|
|
|
int modMode; /**< The texture modulation mode */
|
|
|
|
int blendMode; /**< The texture blend mode */
|
|
|
|
int scaleMode; /**< The texture scale mode */
|
|
|
|
Uint8 r, g, b, a; /**< Texture modulation values */
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Renderer *renderer;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
void *driverdata; /**< Driver specific texture representation */
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Texture *next;
|
2006-07-10 21:04:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Define the SDL renderer structure */
|
2008-09-15 04:32:36 +00:00
|
|
|
struct SDL_Renderer
|
|
|
|
{
|
|
|
|
int (*ActivateRenderer) (SDL_Renderer * renderer);
|
|
|
|
int (*DisplayModeChanged) (SDL_Renderer * renderer);
|
|
|
|
int (*CreateTexture) (SDL_Renderer * renderer, SDL_Texture * texture);
|
|
|
|
int (*QueryTexturePixels) (SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
void **pixels, int *pitch);
|
|
|
|
int (*SetTexturePalette) (SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
const SDL_Color * colors, int firstcolor,
|
|
|
|
int ncolors);
|
|
|
|
int (*GetTexturePalette) (SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
SDL_Color * colors, int firstcolor,
|
|
|
|
int ncolors);
|
|
|
|
int (*SetTextureColorMod) (SDL_Renderer * renderer,
|
|
|
|
SDL_Texture * texture);
|
|
|
|
int (*SetTextureAlphaMod) (SDL_Renderer * renderer,
|
|
|
|
SDL_Texture * texture);
|
|
|
|
int (*SetTextureBlendMode) (SDL_Renderer * renderer,
|
|
|
|
SDL_Texture * texture);
|
|
|
|
int (*SetTextureScaleMode) (SDL_Renderer * renderer,
|
|
|
|
SDL_Texture * texture);
|
|
|
|
int (*UpdateTexture) (SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
const SDL_Rect * rect, const void *pixels,
|
|
|
|
int pitch);
|
|
|
|
int (*LockTexture) (SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
const SDL_Rect * rect, int markDirty, void **pixels,
|
|
|
|
int *pitch);
|
|
|
|
void (*UnlockTexture) (SDL_Renderer * renderer, SDL_Texture * texture);
|
|
|
|
void (*DirtyTexture) (SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
int numrects, const SDL_Rect * rects);
|
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
|
|
|
int (*SetDrawColor) (SDL_Renderer * renderer);
|
|
|
|
int (*SetDrawBlendMode) (SDL_Renderer * renderer);
|
2008-12-21 17:39:41 +00:00
|
|
|
int (*RenderPoint) (SDL_Renderer * renderer, int x, int y);
|
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
|
|
|
int (*RenderLine) (SDL_Renderer * renderer, int x1, int y1, int x2,
|
|
|
|
int y2);
|
|
|
|
int (*RenderFill) (SDL_Renderer * renderer, const SDL_Rect * rect);
|
2008-09-15 04:32:36 +00:00
|
|
|
int (*RenderCopy) (SDL_Renderer * renderer, SDL_Texture * texture,
|
|
|
|
const SDL_Rect * srcrect, const SDL_Rect * dstrect);
|
|
|
|
void (*RenderPresent) (SDL_Renderer * renderer);
|
|
|
|
void (*DestroyTexture) (SDL_Renderer * renderer, SDL_Texture * texture);
|
|
|
|
|
|
|
|
void (*DestroyRenderer) (SDL_Renderer * renderer);
|
|
|
|
|
|
|
|
/* The current renderer info */
|
|
|
|
SDL_RendererInfo info;
|
|
|
|
|
|
|
|
/* The window associated with the renderer */
|
|
|
|
SDL_WindowID window;
|
|
|
|
|
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
|
|
|
Uint8 r, g, b, a; /**< Color for drawing operations values */
|
|
|
|
int blendMode; /**< The drawing blend mode */
|
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
void *driverdata;
|
2006-07-10 21:04:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Define the SDL render driver structure */
|
2008-09-15 04:32:36 +00:00
|
|
|
struct SDL_RenderDriver
|
|
|
|
{
|
|
|
|
SDL_Renderer *(*CreateRenderer) (SDL_Window * window, Uint32 flags);
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
/* Info about the renderer capabilities */
|
|
|
|
SDL_RendererInfo info;
|
2006-07-10 21:04:37 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Define the SDL window structure, corresponding to toplevel windows */
|
2008-09-15 04:32:36 +00:00
|
|
|
struct SDL_Window
|
|
|
|
{
|
|
|
|
Uint32 id;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
char *title;
|
|
|
|
int x, y;
|
|
|
|
int w, h;
|
|
|
|
Uint32 flags;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
int display;
|
|
|
|
SDL_Renderer *renderer;
|
2006-07-10 21:04:37 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
void *userdata;
|
|
|
|
void *driverdata;
|
2006-07-10 21:04:37 +00:00
|
|
|
};
|
|
|
|
#define FULLSCREEN_VISIBLE(W) \
|
|
|
|
(((W)->flags & SDL_WINDOW_FULLSCREEN) && \
|
|
|
|
((W)->flags & SDL_WINDOW_SHOWN) && \
|
|
|
|
!((W)->flags & SDL_WINDOW_MINIMIZED))
|
|
|
|
|
2008-09-02 19:53:56 +00:00
|
|
|
/*
|
|
|
|
* Define the SDL display structure This corresponds to physical monitors
|
|
|
|
* attached to the system.
|
2001-04-26 16:45:43 +00:00
|
|
|
*/
|
2008-09-15 04:32:36 +00:00
|
|
|
struct SDL_VideoDisplay
|
|
|
|
{
|
|
|
|
int max_display_modes;
|
|
|
|
int num_display_modes;
|
|
|
|
SDL_DisplayMode *display_modes;
|
|
|
|
SDL_DisplayMode desktop_mode;
|
|
|
|
SDL_DisplayMode current_mode;
|
|
|
|
SDL_DisplayMode fullscreen_mode;
|
|
|
|
SDL_Palette *palette;
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
Uint16 *gamma;
|
|
|
|
Uint16 *saved_gamma; /* (just offset into gamma) */
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
int num_render_drivers;
|
|
|
|
SDL_RenderDriver *render_drivers;
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
int num_windows;
|
|
|
|
SDL_Window *windows;
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_Renderer *current_renderer;
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
/* The hash list of textures */
|
|
|
|
SDL_Texture *textures[64];
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_VideoDevice *device;
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
void *driverdata;
|
2006-07-10 21:04:37 +00:00
|
|
|
};
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
/* Define the SDL video driver structure */
|
|
|
|
#define _THIS SDL_VideoDevice *_this
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
struct SDL_VideoDevice
|
|
|
|
{
|
|
|
|
/* * * */
|
|
|
|
/* The name of this video driver */
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
/* * * */
|
|
|
|
/* Initialization/Query functions */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize the native video subsystem, filling in the list of
|
|
|
|
* displays for this driver, returning 0 or -1 if there's an error.
|
|
|
|
*/
|
|
|
|
int (*VideoInit) (_THIS);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reverse the effects VideoInit() -- called if VideoInit() fails or
|
|
|
|
* if the application is shutting down the video subsystem.
|
|
|
|
*/
|
|
|
|
void (*VideoQuit) (_THIS);
|
|
|
|
|
|
|
|
/* * * */
|
|
|
|
/*
|
|
|
|
* Display functions
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get a list of the available display modes. e.g.
|
|
|
|
* SDL_AddDisplayMode(_this->current_display, mode)
|
|
|
|
*/
|
|
|
|
void (*GetDisplayModes) (_THIS);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Setting the display mode is independent of creating windows, so
|
|
|
|
* when the display mode is changed, all existing windows should have
|
|
|
|
* their data updated accordingly, including the display surfaces
|
|
|
|
* associated with them.
|
|
|
|
*/
|
|
|
|
int (*SetDisplayMode) (_THIS, SDL_DisplayMode * mode);
|
|
|
|
|
|
|
|
/* Set the color entries of the display palette */
|
|
|
|
int (*SetDisplayPalette) (_THIS, SDL_Palette * palette);
|
|
|
|
|
|
|
|
/* Get the color entries of the display palette */
|
|
|
|
int (*GetDisplayPalette) (_THIS, SDL_Palette * palette);
|
|
|
|
|
|
|
|
/* Set the gamma ramp */
|
|
|
|
int (*SetDisplayGammaRamp) (_THIS, Uint16 * ramp);
|
|
|
|
|
|
|
|
/* Get the gamma ramp */
|
|
|
|
int (*GetDisplayGammaRamp) (_THIS, Uint16 * ramp);
|
|
|
|
|
|
|
|
/* * * */
|
|
|
|
/*
|
|
|
|
* Window functions
|
|
|
|
*/
|
|
|
|
int (*CreateWindow) (_THIS, SDL_Window * window);
|
|
|
|
int (*CreateWindowFrom) (_THIS, SDL_Window * window, const void *data);
|
|
|
|
void (*SetWindowTitle) (_THIS, SDL_Window * window);
|
2009-01-02 17:39:48 +00:00
|
|
|
void (*SetWindowIcon) (_THIS, SDL_Window * window, SDL_Surface * icon);
|
2008-09-15 04:32:36 +00:00
|
|
|
void (*SetWindowPosition) (_THIS, SDL_Window * window);
|
|
|
|
void (*SetWindowSize) (_THIS, SDL_Window * window);
|
|
|
|
void (*ShowWindow) (_THIS, SDL_Window * window);
|
|
|
|
void (*HideWindow) (_THIS, SDL_Window * window);
|
|
|
|
void (*RaiseWindow) (_THIS, SDL_Window * window);
|
|
|
|
void (*MaximizeWindow) (_THIS, SDL_Window * window);
|
|
|
|
void (*MinimizeWindow) (_THIS, SDL_Window * window);
|
|
|
|
void (*RestoreWindow) (_THIS, SDL_Window * window);
|
|
|
|
void (*SetWindowGrab) (_THIS, SDL_Window * window);
|
|
|
|
void (*DestroyWindow) (_THIS, SDL_Window * window);
|
|
|
|
|
|
|
|
/* Get some platform dependent window information */
|
|
|
|
SDL_bool(*GetWindowWMInfo) (_THIS, SDL_Window * window,
|
|
|
|
struct SDL_SysWMinfo * info);
|
|
|
|
|
|
|
|
/* * * */
|
|
|
|
/*
|
|
|
|
* OpenGL support
|
|
|
|
*/
|
|
|
|
int (*GL_LoadLibrary) (_THIS, const char *path);
|
|
|
|
void *(*GL_GetProcAddress) (_THIS, const char *proc);
|
2009-02-09 05:32:12 +00:00
|
|
|
void (*GL_UnloadLibrary) (_THIS);
|
2008-09-15 04:32:36 +00:00
|
|
|
SDL_GLContext(*GL_CreateContext) (_THIS, SDL_Window * window);
|
|
|
|
int (*GL_MakeCurrent) (_THIS, SDL_Window * window, SDL_GLContext context);
|
|
|
|
int (*GL_SetSwapInterval) (_THIS, int interval);
|
|
|
|
int (*GL_GetSwapInterval) (_THIS);
|
|
|
|
void (*GL_SwapWindow) (_THIS, SDL_Window * window);
|
|
|
|
void (*GL_DeleteContext) (_THIS, SDL_GLContext context);
|
|
|
|
|
|
|
|
/* * * */
|
|
|
|
/*
|
|
|
|
* Event manager functions
|
|
|
|
*/
|
|
|
|
void (*PumpEvents) (_THIS);
|
|
|
|
|
2009-01-12 06:19:05 +00:00
|
|
|
/* Suspend the screensaver */
|
|
|
|
void (*SuspendScreenSaver) (_THIS);
|
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
/* * * */
|
|
|
|
/* Data common to all drivers */
|
2009-01-12 06:19:05 +00:00
|
|
|
SDL_bool suspend_screensaver;
|
2008-09-15 04:32:36 +00:00
|
|
|
int num_displays;
|
|
|
|
SDL_VideoDisplay *displays;
|
|
|
|
int current_display;
|
|
|
|
Uint32 next_object_id;
|
|
|
|
|
|
|
|
/* * * */
|
|
|
|
/* Data used by the GL drivers */
|
|
|
|
struct
|
|
|
|
{
|
|
|
|
int red_size;
|
|
|
|
int green_size;
|
|
|
|
int blue_size;
|
|
|
|
int alpha_size;
|
|
|
|
int depth_size;
|
|
|
|
int buffer_size;
|
|
|
|
int stencil_size;
|
|
|
|
int double_buffer;
|
|
|
|
int accum_red_size;
|
|
|
|
int accum_green_size;
|
|
|
|
int accum_blue_size;
|
|
|
|
int accum_alpha_size;
|
|
|
|
int stereo;
|
|
|
|
int multisamplebuffers;
|
|
|
|
int multisamplesamples;
|
|
|
|
int accelerated;
|
Date: Sun, 22 Mar 2009 12:52:29 +0000
From: Luke Benstead
Subject: OpenGL 3.0 Context Creation
I've attached a patch which implements OpenGL 3.x context creation on
the latest SVN. I've added two options to SDL_GL_SetAttribute, these
are SDL_GL_CONTEXT_MAJOR_VERSION and SDL_GL_CONTEXT_MINOR_VERSION.
These default to 2 and 1 respectively. If the major version is less
than 3 then the current context creation method is used, otherwise the
appropriate new context creation function is called (depending on the
platform).
Sample code:
if (SDL_Init(SDL_INIT_VIDEO) != 0) {
printf("Unable to initialize SDL: %s\n", SDL_GetError());
return 1;
}
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); //Without these 2 lines, SDL will create a GL 2.x context
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_Surface* screen = SDL_SetVideoMode( 640, 480, 16, SDL_OPENGL | SDL_FULLSCREEN );
I've implemented context creation on both Win32 and X and run basic
tests on both. This patch doesn't provide access to all the options
allowed by the new context creation (e.g. shared contexts, forward
compatible contexts) but they can be added pretty easily.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403567
2009-03-24 10:43:53 +00:00
|
|
|
int major_version;
|
|
|
|
int minor_version;
|
2008-09-15 04:32:36 +00:00
|
|
|
int retained_backing;
|
|
|
|
int driver_loaded;
|
|
|
|
char driver_path[256];
|
|
|
|
void *dll_handle;
|
|
|
|
} gl_config;
|
|
|
|
|
|
|
|
/* * * */
|
|
|
|
/* Data private to this driver */
|
|
|
|
void *driverdata;
|
|
|
|
struct SDL_GLDriverData *gl_data;
|
|
|
|
|
2009-05-31 11:53:12 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_PANDORA
|
|
|
|
struct SDL_PrivateGLESData *gles_data;
|
|
|
|
#endif
|
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
/* * * */
|
|
|
|
/* The function used to dispose of this structure */
|
|
|
|
void (*free) (_THIS);
|
2001-04-26 16:45:43 +00:00
|
|
|
};
|
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
typedef struct VideoBootStrap
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
const char *desc;
|
|
|
|
int (*available) (void);
|
|
|
|
SDL_VideoDevice *(*create) (int devindex);
|
|
|
|
} VideoBootStrap;
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2006-07-23 09:11:10 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_COCOA
|
|
|
|
extern VideoBootStrap COCOA_bootstrap;
|
2006-02-16 10:11:48 +00:00
|
|
|
#endif
|
|
|
|
#if SDL_VIDEO_DRIVER_X11
|
2001-04-26 16:45:43 +00:00
|
|
|
extern VideoBootStrap X11_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_NANOX
|
2001-05-11 01:13:35 +00:00
|
|
|
extern VideoBootStrap NX_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_IPOD
|
2005-09-08 07:33:22 +00:00
|
|
|
extern VideoBootStrap iPod_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_WSCONS
|
|
|
|
extern VideoBootStrap WSCONS_bootstrap;
|
|
|
|
#endif
|
|
|
|
#if SDL_VIDEO_DRIVER_FBCON
|
2001-04-26 16:45:43 +00:00
|
|
|
extern VideoBootStrap FBCON_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_DIRECTFB
|
2001-09-04 22:53:46 +00:00
|
|
|
extern VideoBootStrap DirectFB_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_PS2GS
|
2001-04-26 16:45:43 +00:00
|
|
|
extern VideoBootStrap PS2GS_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_VGL
|
2001-06-19 13:33:54 +00:00
|
|
|
extern VideoBootStrap VGL_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_SVGALIB
|
2001-04-26 16:45:43 +00:00
|
|
|
extern VideoBootStrap SVGALIB_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_GAPI
|
2006-01-19 08:43:00 +00:00
|
|
|
extern VideoBootStrap GAPI_bootstrap;
|
|
|
|
#endif
|
2006-07-10 21:04:37 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_WIN32
|
|
|
|
extern VideoBootStrap WIN32_bootstrap;
|
2001-04-26 16:45:43 +00:00
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_BWINDOW
|
2001-04-26 16:45:43 +00:00
|
|
|
extern VideoBootStrap BWINDOW_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_PHOTON
|
2009-03-03 04:21:51 +00:00
|
|
|
extern VideoBootStrap photon_bootstrap;
|
|
|
|
#endif
|
|
|
|
#if SDL_VIDEO_DRIVER_QNXGF
|
|
|
|
extern VideoBootStrap qnxgf_bootstrap;
|
2001-09-11 20:38:49 +00:00
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_EPOC
|
2001-09-11 20:38:49 +00:00
|
|
|
extern VideoBootStrap EPOC_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_XBIOS
|
2002-02-17 19:54:28 +00:00
|
|
|
extern VideoBootStrap XBIOS_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_GEM
|
2002-02-17 19:54:28 +00:00
|
|
|
extern VideoBootStrap GEM_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_DC
|
2002-10-05 16:50:56 +00:00
|
|
|
extern VideoBootStrap DC_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_RISCOS
|
2003-05-29 04:44:13 +00:00
|
|
|
extern VideoBootStrap RISCOS_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_OS2FS
|
2005-11-23 07:29:56 +00:00
|
|
|
extern VideoBootStrap OS2FSLib_bootstrap;
|
|
|
|
#endif
|
2008-09-02 19:53:56 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_UIKIT
|
|
|
|
extern VideoBootStrap UIKIT_bootstrap;
|
|
|
|
#endif
|
2006-02-16 10:11:48 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_DUMMY
|
|
|
|
extern VideoBootStrap DUMMY_bootstrap;
|
|
|
|
#endif
|
2008-08-27 15:10:03 +00:00
|
|
|
#if SDL_VIDEO_DRIVER_NDS
|
|
|
|
extern VideoBootStrap NDS_bootstrap;
|
2009-05-31 11:53:12 +00:00
|
|
|
#endif
|
|
|
|
#if SDL_VIDEO_DRIVER_PANDORA
|
|
|
|
extern VideoBootStrap PND_bootstrap;
|
2008-08-27 15:10:03 +00:00
|
|
|
#endif
|
2006-07-10 21:04:37 +00:00
|
|
|
|
|
|
|
#define SDL_CurrentDisplay (_this->displays[_this->current_display])
|
2006-02-16 10:11:48 +00:00
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
extern SDL_VideoDevice *SDL_GetVideoDevice();
|
2008-09-15 04:32:36 +00:00
|
|
|
extern int SDL_AddBasicVideoDisplay(const SDL_DisplayMode * desktop_mode);
|
|
|
|
extern int SDL_AddVideoDisplay(const SDL_VideoDisplay * display);
|
|
|
|
extern SDL_bool
|
|
|
|
SDL_AddDisplayMode(int displayIndex, const SDL_DisplayMode * mode);
|
|
|
|
extern void
|
|
|
|
SDL_AddRenderDriver(int displayIndex, const SDL_RenderDriver * driver);
|
|
|
|
|
|
|
|
extern int SDL_RecreateWindow(SDL_Window * window, Uint32 flags);
|
2006-07-10 21:04:37 +00:00
|
|
|
extern SDL_Window *SDL_GetWindowFromID(SDL_WindowID windowID);
|
|
|
|
extern SDL_VideoDisplay *SDL_GetDisplayFromWindow(SDL_Window * window);
|
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
extern void SDL_OnWindowShown(SDL_Window * window);
|
|
|
|
extern void SDL_OnWindowHidden(SDL_Window * window);
|
|
|
|
extern void SDL_OnWindowResized(SDL_Window * window);
|
|
|
|
extern void SDL_OnWindowFocusGained(SDL_Window * window);
|
|
|
|
extern void SDL_OnWindowFocusLost(SDL_Window * window);
|
2006-07-10 21:04:37 +00:00
|
|
|
extern SDL_WindowID SDL_GetFocusWindow(void);
|
2001-04-26 16:45:43 +00:00
|
|
|
|
2008-09-15 04:32:36 +00:00
|
|
|
#endif /* _SDL_sysvideo_h */
|
2006-07-10 21:04:37 +00:00
|
|
|
|
|
|
|
/* vi: set ts=4 sw=4 expandtab: */
|