Mercurial > sdl-ios-xcode
view src/video/Xext/Xinerama/Xinerama.c @ 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 | c121d94672cb |
children | 81dde1b00bf1 |
line wrap: on
line source
/* $Xorg: XPanoramiX.c,v 1.4 2000/08/17 19:45:51 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of Digital Equipment Corporation shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ /* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.2 2001/07/23 17:20:28 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES #include <X11/Xlibint.h> #include <X11/Xutil.h> #include "../extensions/Xext.h" #include "../extensions/extutil.h" /* in ../include */ #include "../extensions/panoramiXext.h" #include "../extensions/panoramiXproto.h" /* in ../include */ #include "../extensions/Xinerama.h" static XExtensionInfo _panoramiX_ext_info_data; static XExtensionInfo *panoramiX_ext_info = &_panoramiX_ext_info_data; static /* const */ char *panoramiX_extension_name = PANORAMIX_PROTOCOL_NAME; #define PanoramiXCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, panoramiX_extension_name, val) #define PanoramiXSimpleCheckExtension(dpy,i) \ XextSimpleCheckExtension (dpy, i, panoramiX_extension_name) static int close_display(); static /* const */ XExtensionHooks panoramiX_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ NULL, /* flush_gc */ NULL, /* free_gc */ NULL, /* create_font */ NULL, /* free_font */ close_display, /* close_display */ NULL, /* wire_to_event */ NULL, /* event_to_wire */ NULL, /* error */ NULL, /* error_string */ }; static XEXT_GENERATE_FIND_DISPLAY(find_display, panoramiX_ext_info, panoramiX_extension_name, &panoramiX_extension_hooks, 0, NULL) static XEXT_GENERATE_CLOSE_DISPLAY(close_display, panoramiX_ext_info) /**************************************************************************** * * * PanoramiX public interfaces * * * ****************************************************************************/ Bool SDL_NAME(XPanoramiXQueryExtension) (Display * dpy, int *event_basep, int *error_basep) { XExtDisplayInfo *info = find_display(dpy); if (XextHasExtension(info)) { *event_basep = info->codes->first_event; *error_basep = info->codes->first_error; return True; } else { return False; } } Status SDL_NAME(XPanoramiXQueryVersion) (Display * dpy, int *major_versionp, int *minor_versionp) { XExtDisplayInfo *info = find_display(dpy); xPanoramiXQueryVersionReply rep; register xPanoramiXQueryVersionReq *req; PanoramiXCheckExtension(dpy, info, 0); LockDisplay(dpy); GetReq(PanoramiXQueryVersion, req); req->reqType = info->codes->major_opcode; req->panoramiXReqType = X_PanoramiXQueryVersion; req->clientMajor = PANORAMIX_MAJOR_VERSION; req->clientMinor = PANORAMIX_MINOR_VERSION; if (!_XReply(dpy, (xReply *) & rep, 0, xTrue)) { UnlockDisplay(dpy); SyncHandle(); return 0; } *major_versionp = rep.majorVersion; *minor_versionp = rep.minorVersion; UnlockDisplay(dpy); SyncHandle(); return 1; } SDL_NAME(XPanoramiXInfo) * SDL_NAME(XPanoramiXAllocInfo) (void) { return (SDL_NAME(XPanoramiXInfo) *) Xmalloc(sizeof(SDL_NAME(XPanoramiXInfo))); } Status SDL_NAME(XPanoramiXGetState) (Display * dpy, Drawable drawable, SDL_NAME(XPanoramiXInfo) * panoramiX_info) { XExtDisplayInfo *info = find_display(dpy); xPanoramiXGetStateReply rep; register xPanoramiXGetStateReq *req; PanoramiXCheckExtension(dpy, info, 0); LockDisplay(dpy); GetReq(PanoramiXGetState, req); req->reqType = info->codes->major_opcode; req->panoramiXReqType = X_PanoramiXGetState; req->window = drawable; if (!_XReply(dpy, (xReply *) & rep, 0, xTrue)) { UnlockDisplay(dpy); SyncHandle(); return 0; } UnlockDisplay(dpy); SyncHandle(); panoramiX_info->window = rep.window; panoramiX_info->State = rep.state; return 1; } Status SDL_NAME(XPanoramiXGetScreenCount) (Display * dpy, Drawable drawable, SDL_NAME(XPanoramiXInfo) * panoramiX_info) { XExtDisplayInfo *info = find_display(dpy); xPanoramiXGetScreenCountReply rep; register xPanoramiXGetScreenCountReq *req; PanoramiXCheckExtension(dpy, info, 0); LockDisplay(dpy); GetReq(PanoramiXGetScreenCount, req); req->reqType = info->codes->major_opcode; req->panoramiXReqType = X_PanoramiXGetScreenCount; req->window = drawable; if (!_XReply(dpy, (xReply *) & rep, 0, xTrue)) { UnlockDisplay(dpy); SyncHandle(); return 0; } UnlockDisplay(dpy); SyncHandle(); panoramiX_info->window = rep.window; panoramiX_info->ScreenCount = rep.ScreenCount; return 1; } Status SDL_NAME(XPanoramiXGetScreenSize) (Display * dpy, Drawable drawable, int screen_num, SDL_NAME(XPanoramiXInfo) * panoramiX_info) { XExtDisplayInfo *info = find_display(dpy); xPanoramiXGetScreenSizeReply rep; register xPanoramiXGetScreenSizeReq *req; PanoramiXCheckExtension(dpy, info, 0); LockDisplay(dpy); GetReq(PanoramiXGetScreenSize, req); req->reqType = info->codes->major_opcode; req->panoramiXReqType = X_PanoramiXGetScreenSize; req->window = drawable; req->screen = screen_num; /* need to define */ if (!_XReply(dpy, (xReply *) & rep, 0, xTrue)) { UnlockDisplay(dpy); SyncHandle(); return 0; } UnlockDisplay(dpy); SyncHandle(); panoramiX_info->window = rep.window; panoramiX_info->screen = rep.screen; panoramiX_info->width = rep.width; panoramiX_info->height = rep.height; return 1; } /*******************************************************************\ Alternate interface to make up for shortcomings in the original, namely, the omission of the screen origin. The new interface is in the "Xinerama" namespace instead of "PanoramiX". \*******************************************************************/ Bool SDL_NAME(XineramaQueryExtension) (Display * dpy, int *event_base, int *error_base) { return SDL_NAME(XPanoramiXQueryExtension) (dpy, event_base, error_base); } Status SDL_NAME(XineramaQueryVersion) (Display * dpy, int *major, int *minor) { return SDL_NAME(XPanoramiXQueryVersion) (dpy, major, minor); } Bool SDL_NAME(XineramaIsActive) (Display * dpy) { xXineramaIsActiveReply rep; xXineramaIsActiveReq *req; XExtDisplayInfo *info = find_display(dpy); if (!XextHasExtension(info)) return False; /* server doesn't even have the extension */ LockDisplay(dpy); GetReq(XineramaIsActive, req); req->reqType = info->codes->major_opcode; req->panoramiXReqType = X_XineramaIsActive; if (!_XReply(dpy, (xReply *) & rep, 0, xTrue)) { UnlockDisplay(dpy); SyncHandle(); return False; } UnlockDisplay(dpy); SyncHandle(); return rep.state; } #include <stdio.h> SDL_NAME(XineramaScreenInfo) * SDL_NAME(XineramaQueryScreens) (Display * dpy, int *number) { XExtDisplayInfo *info = find_display(dpy); xXineramaQueryScreensReply rep; xXineramaQueryScreensReq *req; SDL_NAME(XineramaScreenInfo) * scrnInfo = NULL; PanoramiXCheckExtension(dpy, info, 0); LockDisplay(dpy); GetReq(XineramaQueryScreens, req); req->reqType = info->codes->major_opcode; req->panoramiXReqType = X_XineramaQueryScreens; if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) { UnlockDisplay(dpy); SyncHandle(); return NULL; } if (rep.number) { if ((scrnInfo = Xmalloc(sizeof(SDL_NAME(XineramaScreenInfo)) * rep.number))) { xXineramaScreenInfo scratch; int i; for (i = 0; i < rep.number; i++) { _XRead(dpy, (char *) (&scratch), sz_XineramaScreenInfo); scrnInfo[i].screen_number = i; scrnInfo[i].x_org = scratch.x_org; scrnInfo[i].y_org = scratch.y_org; scrnInfo[i].width = scratch.width; scrnInfo[i].height = scratch.height; } *number = rep.number; } else _XEatData(dpy, rep.length << 2); } UnlockDisplay(dpy); SyncHandle(); return scrnInfo; } /* vi: set ts=4 sw=4 expandtab: */