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

wined3d: Add GL locking to match_fbo_tex_update().

This commit is contained in:
Henri Verbeet 2010-03-25 22:51:21 +01:00 committed by Alexandre Julliard
parent 23d33f2379
commit 8cf63f0aee
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/wined3d/directx.c
View File

@ -669,6 +669,7 @@ static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const ch
return ret; return ret;
} }
/* Context activation is done by the caller. */
static BOOL match_fbo_tex_update(const struct wined3d_gl_info *gl_info, const char *gl_renderer, static BOOL match_fbo_tex_update(const struct wined3d_gl_info *gl_info, const char *gl_renderer,
enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device) enum wined3d_gl_vendor gl_vendor, enum wined3d_pci_vendor card_vendor, enum wined3d_pci_device device)
{ {
@ -680,6 +681,8 @@ static BOOL match_fbo_tex_update(const struct wined3d_gl_info *gl_info, const ch
memset(data, 0xcc, sizeof(data)); memset(data, 0xcc, sizeof(data));
ENTER_GL();
glGenTextures(1, &tex); glGenTextures(1, &tex);
glBindTexture(GL_TEXTURE_2D, tex); glBindTexture(GL_TEXTURE_2D, tex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@ -716,6 +719,8 @@ static BOOL match_fbo_tex_update(const struct wined3d_gl_info *gl_info, const ch
glDeleteTextures(1, &tex); glDeleteTextures(1, &tex);
checkGLcall("glDeleteTextures"); checkGLcall("glDeleteTextures");
LEAVE_GL();
return *(DWORD *)data == 0x11111111; return *(DWORD *)data == 0x11111111;
} }