wine-commits June 2006

wine-commits@winehq.org

3 participants
854 discussions

Huw Davies : winex11: Introduce a function to retrieve the glx drawable and have
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: f4e8169e9acb59b340b2a8f521d44a9f012267bc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f4e8169e9acb59b340b2a8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 23 12:13:55 2006 +0100 winex11: Introduce a function to retrieve the glx drawable and have both the GET_GLX_DRAWABLE Escape and SwapBuffers call it. --- dlls/winex11.drv/init.c | 13 +------ dlls/winex11.drv/opengl.c | 89 ++++++++++++++++++++++++++++-… [View More]---------------- dlls/winex11.drv/x11drv.h | 2 + 3 files changed, 58 insertions(+), 46 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 0aa38a4..651b2b4 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -410,18 +410,7 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *ph case X11DRV_GET_GLX_DRAWABLE: if (out_count >= sizeof(Drawable)) { - if(physDev->bitmap) - { - if (physDev->bitmap->hbitmap == BITMAP_stock_phys_bitmap.hbitmap) - *(Drawable *)out_data = physDev->drawable; /* PBuffer */ - else { - if(!physDev->bitmap->glxpixmap) - physDev->bitmap->glxpixmap = create_glxpixmap(physDev); - *(Drawable *)out_data = physDev->bitmap->glxpixmap; - } - } - else - *(Drawable *)out_data = physDev->drawable; + *(Drawable *)out_data = get_glxdrawable(physDev); return TRUE; } break; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 60ebcce..2fe6c9d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -523,12 +523,64 @@ BOOL X11DRV_SetPixelFormat(X11DRV_PDEVIC return TRUE; } +static XID create_glxpixmap(X11DRV_PDEVICE *physDev) +{ + GLXPixmap ret; + XVisualInfo *vis; + XVisualInfo template; + int num; + GLXFBConfig *cfgs; + + wine_tsx11_lock(); + cfgs = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &num); + pglXGetFBConfigAttrib(gdi_display, cfgs[physDev->current_pf - 1], GLX_VISUAL_ID, (int *)&template.visualid); + + vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); + + ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); + XFree(vis); + XFree(cfgs); + wine_tsx11_unlock(); + TRACE("return %lx\n", ret); + return ret; +} + +Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) +{ + Drawable ret; + + if(physDev->bitmap) + { + if (physDev->bitmap->hbitmap == BITMAP_stock_phys_bitmap.hbitmap) + ret = physDev->drawable; /* PBuffer */ + else + { + if(!physDev->bitmap->glxpixmap) + physDev->bitmap->glxpixmap = create_glxpixmap(physDev); + ret = physDev->bitmap->glxpixmap; + } + } + else + ret = physDev->drawable; + return ret; +} + +BOOL destroy_glxpixmap(XID glxpixmap) +{ + wine_tsx11_lock(); + pglXDestroyGLXPixmap(gdi_display, glxpixmap); + wine_tsx11_unlock(); + return TRUE; +} + /** * X11DRV_SwapBuffers * * Swap the buffers of this DC */ -BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) { +BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE *physDev) +{ + GLXDrawable drawable; if (!has_opengl()) { ERR("No libGL on this box - disabling OpenGL support !\n"); return 0; @@ -536,8 +588,9 @@ BOOL X11DRV_SwapBuffers(X11DRV_PDEVICE * TRACE_(opengl)("(%p)\n", physDev); + drawable = get_glxdrawable(physDev); wine_tsx11_lock(); - pglXSwapBuffers(gdi_display, physDev->drawable); + pglXSwapBuffers(gdi_display, drawable); wine_tsx11_unlock(); return TRUE; @@ -587,36 +640,6 @@ XVisualInfo *X11DRV_setup_opengl_visual( return visual; } -XID create_glxpixmap(X11DRV_PDEVICE *physDev) -{ - GLXPixmap ret; - XVisualInfo *vis; - XVisualInfo template; - int num; - GLXFBConfig *cfgs; - - wine_tsx11_lock(); - cfgs = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &num); - pglXGetFBConfigAttrib(gdi_display, cfgs[physDev->current_pf - 1], GLX_VISUAL_ID, (int *)&template.visualid); - - vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); - - ret = pglXCreateGLXPixmap(gdi_display, vis, physDev->bitmap->pixmap); - XFree(vis); - XFree(cfgs); - wine_tsx11_unlock(); - TRACE("return %lx\n", ret); - return ret; -} - -BOOL destroy_glxpixmap(XID glxpixmap) -{ - wine_tsx11_lock(); - pglXDestroyGLXPixmap(gdi_display, glxpixmap); - wine_tsx11_unlock(); - return TRUE; -} - #else /* no OpenGL includes */ void X11DRV_OpenGL_Init(Display *display) @@ -679,7 +702,7 @@ XVisualInfo *X11DRV_setup_opengl_visual( return NULL; } -XID create_glxpixmap(X11DRV_PDEVICE *physDev) +Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) { return 0; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index adbb1f7..9537b77 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -272,7 +272,7 @@ extern BOOL X11DRV_XRender_ExtTextOut(X1 extern void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev); extern XVisualInfo *X11DRV_setup_opengl_visual(Display *display); -extern XID create_glxpixmap(X11DRV_PDEVICE *physDev); +extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev); extern BOOL destroy_glxpixmap(XID glxpixmap); /* XIM support */ [View Less]

1 0

Paul Vriens : imagehlp: Fixed typo (Coverity).
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 7c6febe6eb95209db71f8a76cf4d2d6058bd86a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c6febe6eb95209db71f8a7… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Jun 23 13:02:56 2006 +0200 imagehlp: Fixed typo (Coverity). --- dlls/imagehlp/modify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index 92b195d..ee21ddd 100644 --- a/dlls/… [View More]

1 0

appdb/. maintainersubmit.php
by WineHQ 26 Jun '06

26 Jun '06

ChangeSet ID: 26014 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/25 20:43:00 Modified files: . : maintainersubmit.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix applying to become a super maintainer Patch: http://cvs.winehq.org/patch.py?id=26014 Old revision New revision Changes Path 1.24 1.25 +1 -1 appdb/maintainersubmit.php Index: appdb/maintainersubmit.php diff -u -p appdb/… [View More]

1 0

appdb/include application.php distributions.ph ...
by WineHQ 26 Jun '06

26 Jun '06

ChangeSet ID: 26013 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/25 19:44:44 Modified files: include : application.php distributions.php incl.php testResults.php version.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Warn if magic quotes is enabled and explain a bit about why we require that magic quotes be disabled. Also remove all of the conditional code that was working around cases where we had magic … [View More]

1 0

appdb/include testResults.php
by WineHQ 24 Jun '06

24 Jun '06

ChangeSet ID: 26012 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/24 00:02:56 Modified files: include : testResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix a warning due to missing first parameter when testData::OutputEditor() is called from adminTestResults.php. At this point we never expect to have a $sDistribution so we can just default the parameter to a null string Patch: http://cvs.winehq.org/patch.py?id=… [View More]

1 0

appdb/ ./maintainersubmit.php admin/adminAppDa ...
by WineHQ 24 Jun '06

24 Jun '06

ChangeSet ID: 26011 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 23:20:32 Modified files: . : maintainersubmit.php admin : adminAppDataQueue.php editBundle.php include : appdb.php application.php bugs.php category.php comment.php db.php distributions.php monitor.php note.php screenshot.php testResults.php url.php user.php util.php vendor.php … [View More]

1 0

appdb/. appsubmit.php
by WineHQ 24 Jun '06

24 Jun '06

ChangeSet ID: 26010 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 23:07:42 Modified files: . : appsubmit.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Disable hackish looking "we've got errors message" since we'll display human readable errors later on. Patch: http://cvs.winehq.org/patch.py?id=26010 Old revision New revision Changes Path 1.41 1.42 +4 -4 appdb/appsubmit.php Index: … [View More]

1 0

appdb/include vote.php
by WineHQ 24 Jun '06

24 Jun '06

ChangeSet ID: 26009 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 22:09:07 Modified files: include : vote.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix voting. Another case, ha ha, where different capitalization messed us up Patch: http://cvs.winehq.org/patch.py?id=26009 Old revision New revision Changes Path 1.14 1.15 +1 -1 appdb/include/vote.php Index: appdb/include/vote.php diff -u -… [View More]

1 0

appdb/. appbrowse.php
by WineHQ 24 Jun '06

24 Jun '06

ChangeSet ID: 26008 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 22:05:16 Modified files: . : appbrowse.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Retrieve iCatId from $_REQUEST(), we can't use $aClean[] because it isn't in scope. Fixes editing categories Patch: http://cvs.winehq.org/patch.py?id=26008 Old revision New revision Changes Path 1.12 1.13 +4 -6 appdb/appbrowse.php … [View More]

1 0

appdb/include testResults.php
by WineHQ 24 Jun '06

24 Jun '06

ChangeSet ID: 26007 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/06/23 21:38:44 Modified files: include : testResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix entering a new distribution when submitting a new application or version Patch: http://cvs.winehq.org/patch.py?id=26007 Old revision New revision Changes Path 1.17 1.18 +1 -1 appdb/include/testResults.php Index: appdb/include/… [View More]

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2006