sdl-ios-xcode: src/video/win32/SDL

annotate src/video/win32/SDL_win32video.h @ 3100:7dc982143c06

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.

author	Sam Lantinga <slouken@libsdl.org>
date	Tue, 24 Mar 2009 10:43:53 +0000
parents	d2f68ec8c1d0
children	6338b7f2d024

rev	line source
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
2859 99210400e8b9 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 2728 diff changeset	3 Copyright (C) 1997-2009 Sam Lantinga
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 #ifndef _SDL_win32video_h
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25 #define _SDL_win32video_h
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27 #include "../SDL_sysvideo.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 #define WIN32_LEAN_AND_MEAN
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 #define UNICODE
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31 #define WINVER 0x500 /* Need 0x410 for AlphaBlend() and 0x500 for EnumDisplayDevices() */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 #include <windows.h>
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34 #if SDL_VIDEO_RENDER_D3D
1901 f1828a500391 Removed libc dependency on Windows again, to fix building with Visual C++ 2005 Express Edition. Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	35 //#include <d3d9.h>
f1828a500391 Removed libc dependency on Windows again, to fix building with Visual C++ 2005 Express Edition. Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	36 #define D3D_DEBUG_INFO
f1828a500391 Removed libc dependency on Windows again, to fix building with Visual C++ 2005 Express Edition. Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	37 #include "d3d9.h"
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 #endif
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39
2724 0e2b65f32298 Added Wacom API headers. Sam Lantinga <slouken@libsdl.org> parents: 2308 diff changeset	40 #include "wactab/wintab.h"
0e2b65f32298 Added Wacom API headers. Sam Lantinga <slouken@libsdl.org> parents: 2308 diff changeset	41 #define PACKETDATA ( PK_X \| PK_Y \| PK_BUTTONS \| PK_NORMAL_PRESSURE \| PK_CURSOR)
0e2b65f32298 Added Wacom API headers. Sam Lantinga <slouken@libsdl.org> parents: 2308 diff changeset	42 #define PACKETMODE 0
0e2b65f32298 Added Wacom API headers. Sam Lantinga <slouken@libsdl.org> parents: 2308 diff changeset	43 #include "wactab/pktdef.h"
0e2b65f32298 Added Wacom API headers. Sam Lantinga <slouken@libsdl.org> parents: 2308 diff changeset	44
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 #include "SDL_win32events.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 #include "SDL_win32gamma.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 #include "SDL_win32keyboard.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48 #include "SDL_win32modes.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 #include "SDL_win32mouse.h"
1913 83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1901 diff changeset	50 #include "SDL_win32opengl.h"
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 #include "SDL_win32window.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53 #ifdef UNICODE
1901 f1828a500391 Removed libc dependency on Windows again, to fix building with Visual C++ 2005 Express Edition. Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	54 #define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "UCS-2", (char )S, (SDL_wcslen(S)+1)sizeof(WCHAR))
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 #define WIN_UTF8ToString(S) (WCHAR )SDL_iconv_string("UCS-2", "UTF-8", (char )S, SDL_strlen(S)+1)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56 #else
1901 f1828a500391 Removed libc dependency on Windows again, to fix building with Visual C++ 2005 Express Edition. Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	57 #define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "ASCII", (char *)S, (SDL_strlen(S)+1))
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 #define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 #endif
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 /* Private display data */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 typedef struct SDL_VideoData
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65 #if SDL_VIDEO_RENDER_D3D
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 HANDLE d3dDLL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67 IDirect3D9 *d3d;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 #endif
2726 f23ebf1ddac4 Dynamically load wintab32.dll Sam Lantinga <slouken@libsdl.org> parents: 2724 diff changeset	69 /* INDENT-OFF */
f23ebf1ddac4 Dynamically load wintab32.dll Sam Lantinga <slouken@libsdl.org> parents: 2724 diff changeset	70 /* Function pointers for the Wacom API */
f23ebf1ddac4 Dynamically load wintab32.dll Sam Lantinga <slouken@libsdl.org> parents: 2724 diff changeset	71 HANDLE wintabDLL;
2728 2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2726 diff changeset	72 UINT (*WTInfoA) (UINT, UINT, LPVOID);
2768bd7281e0 Fixed Visual Studio compilation problems Sam Lantinga <slouken@libsdl.org> parents: 2726 diff changeset	73 HCTX (*WTOpenA) (HWND, LPLOGCONTEXTA, BOOL);
2726 f23ebf1ddac4 Dynamically load wintab32.dll Sam Lantinga <slouken@libsdl.org> parents: 2724 diff changeset	74 int (*WTPacket) (HCTX, UINT, LPVOID);
f23ebf1ddac4 Dynamically load wintab32.dll Sam Lantinga <slouken@libsdl.org> parents: 2724 diff changeset	75 BOOL (*WTClose) (HCTX);
f23ebf1ddac4 Dynamically load wintab32.dll Sam Lantinga <slouken@libsdl.org> parents: 2724 diff changeset	76 /* INDENT-ON */
f23ebf1ddac4 Dynamically load wintab32.dll Sam Lantinga <slouken@libsdl.org> parents: 2724 diff changeset	77
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 int keyboard;
2308 514f7c1651fc Untested Win32 keyboard scancode code. Sam Lantinga <slouken@libsdl.org> parents: 1913 diff changeset	79 SDL_scancode *key_layout;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80 } SDL_VideoData;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 #endif /* _SDL_win32video_h */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/win32/SDL_win32video.h @ 3100:7dc982143c06