ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

opengl: Sync a dibsection to its pixmap before drawing to it via opengl.

This commit is contained in:
Huw Davies 2006-02-02 13:23:55 +01:00 committed by Alexandre Julliard
parent a488901256
commit 13268261bb
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/opengl32/opengl_ext.h
View File

@ -58,7 +58,8 @@ extern void (*wine_tsx11_lock_ptr)(void);
extern void (*wine_tsx11_unlock_ptr)(void);
/* As GLX relies on X, this is needed */
#define ENTER_GL() wine_tsx11_lock_ptr()
void enter_gl(void);
#define ENTER_GL() enter_gl()
#define LEAVE_GL() wine_tsx11_unlock_ptr()

22
dlls/opengl32/wgl.c
View File

@ -54,7 +54,8 @@ enum x11drv_escape_codes
X11DRV_END_EXPOSURES, /* end graphics exposures */
X11DRV_GET_DCE, /* get the DCE pointer */
X11DRV_SET_DCE, /* set the DCE pointer */
X11DRV_GET_GLX_DRAWABLE /* get current glx drawable for a DC */
X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */
X11DRV_SYNC_PIXMAP /* sync the dibsection to its pixmap */
};
void (*wine_tsx11_lock_ptr)(void) = NULL;
@ -88,6 +89,25 @@ static inline Wine_GLContext *get_context_from_GLXContext(GLXContext ctx)
return ret;
}
void enter_gl(void)
{
GLXContext gl_ctx;
Wine_GLContext *ctx;
enum x11drv_escape_codes escape = X11DRV_SYNC_PIXMAP;
wine_tsx11_lock_ptr();
gl_ctx = glXGetCurrentContext();
if(!gl_ctx) return;
ctx = get_context_from_GLXContext(gl_ctx);
wine_tsx11_unlock_ptr(); /* unlock before calling GDI apis */
if(ctx && GetObjectType(ctx->hdc) == OBJ_MEMDC)
ExtEscape(ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, 0, NULL);
wine_tsx11_lock_ptr();
return;
}
static inline void free_context(Wine_GLContext *context)
{
if (context->next != NULL) context->next->prev = context->prev;

10
dlls/x11drv/init.c
View File

@ -414,8 +414,6 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID
{
if(!physDev->bitmap->glxpixmap)
physDev->bitmap->glxpixmap = create_glxpixmap(physDev);
X11DRV_CoerceDIBSection(physDev, DIB_Status_GdiMod, FALSE);
*(Drawable *)out_data = physDev->bitmap->glxpixmap;
}
else
@ -423,6 +421,14 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID
return TRUE;
}
break;
case X11DRV_SYNC_PIXMAP:
if(physDev->bitmap)
{
X11DRV_CoerceDIBSection(physDev, DIB_Status_GdiMod, FALSE);
return TRUE;
}
return FALSE;
break;
}
}
break;

3
dlls/x11drv/x11drv.h
View File

@ -480,7 +480,8 @@ enum x11drv_escape_codes
X11DRV_END_EXPOSURES, /* end graphics exposures */
X11DRV_GET_DCE, /* get the DCE pointer */
X11DRV_SET_DCE, /* set the DCE pointer */
X11DRV_GET_GLX_DRAWABLE /* get current glx drawable for a DC */
X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */
X11DRV_SYNC_PIXMAP /* sync the dibsection to its pixmap */
};
struct x11drv_escape_set_drawable