August 2008 - Wine-commits - list.winehq.org

Muneyuki Noguchi : winefile: Add a Japanese resource file.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: b8b3a7d89b202aa01305193444ae95ac91cbe321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b3a7d89b202aa0130519344… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Fri Aug 22 23:51:32 2008 +0900 winefile: Add a Japanese resource file. --- programs/winefile/Ja.rc | 260 +++++++++++++++++++++++++++++++++++++++++++++ programs/winefile/rsrc.rc | 1 + 2 files changed, 261 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8b3a7d89b202aa013051…

1 0

Muneyuki Noguchi : winecfg: Update Japanese translation.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 7fe4e83c33f17f9f53c2eec5211a1b42d12a9363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe4e83c33f17f9f53c2eec52… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Fri Aug 22 22:15:41 2008 +0900 winecfg: Update Japanese translation. --- programs/winecfg/Ja.rc | 110 ++++++++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fe4e83c33f17f9f53c2e…

1 0

Stefan Dösinger : wined3d: Don' t retry less strict formats if a match was found.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: e110f2c680d0739b0e48c5136d3cdba8eda59cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e110f2c680d0739b0e48c5136… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Aug 16 15:49:11 2008 +0200 wined3d: Don't retry less strict formats if a match was found. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a190b2b..fb3fcc4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -176,7 +176,7 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF getDepthStencilBits(DepthStencilFormat, &depthBits, &stencilBits); } - for(matchtry = 0; matchtry < (sizeof(matches) / sizeof(matches[0])); matchtry++) { + for(matchtry = 0; matchtry < (sizeof(matches) / sizeof(matches[0])) && !iPixelFormat; matchtry++) { for(i=0; i<nCfgs; i++) { BOOL exactDepthMatch = TRUE; cfgs = &This->adapter->cfgs[i];

1 0

Roy Shea : mstask: Implemented PersistFile_Save stub.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 2172120fae14d1c69e8b2e6b9588acf6f00a6996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2172120fae14d1c69e8b2e6b9… Author: Roy Shea <royshea(a)gmail.com> Date: Fri Aug 22 12:55:22 2008 -0700 mstask: Implemented PersistFile_Save stub. --- dlls/mstask/task.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 2c70ef5..47a9b9a 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -652,7 +652,9 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save( BOOL fRemember) { FIXME("(%p, %p, %d): stub\n", iface, pszFileName, fRemember); - return E_NOTIMPL; + WARN("Returning S_OK but not writing to disk: %s %d\n", + debugstr_w(pszFileName), fRemember); + return S_OK; } static HRESULT WINAPI MSTASK_IPersistFile_SaveCompleted(

1 0

Stefan Dösinger : wined3d: Fix the drawStridedSlow callback function calling convention.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 61a900fdfc4ce34484b946e09d6c3539ec56327f URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a900fdfc4ce34484b946e09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 15 18:04:20 2008 +0200 wined3d: Fix the drawStridedSlow callback function calling convention. Since some of those function pointers are direct GL functions the function prototype needs the WINE_GLAPI calling convention. This makes prevents drawStridedSlow from crashing with USE_WIN32_OPENGL. --- dlls/wined3d/directx.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5120c5e..2cf89e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3893,7 +3893,7 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { } } -void invalid_func(void *data) { +static void WINE_GLAPI invalid_func(void *data) { ERR("Invalid vertex attribute function called\n"); DebugBreak(); } @@ -3903,7 +3903,7 @@ void invalid_func(void *data) { /* Helper functions for providing vertex data to opengl. The arrays are initialized based on * the extension detection and are used in drawStridedSlow */ -static void position_d3dcolor(void *data) { +static void WINE_GLAPI position_d3dcolor(void *data) { DWORD pos = *((DWORD *) data); FIXME("Add a test for fixed function position from d3dcolor type\n"); @@ -3912,7 +3912,7 @@ static void position_d3dcolor(void *data) { D3DCOLOR_B_B(pos), D3DCOLOR_B_A(pos)); } -static void position_float4(void *data) { +static void WINE_GLAPI position_float4(void *data) { GLfloat *pos = (float *) data; if (pos[3] < eps && pos[3] > -eps) @@ -3924,7 +3924,7 @@ static void position_float4(void *data) { } } -static void diffuse_d3dcolor(void *data) { +static void WINE_GLAPI diffuse_d3dcolor(void *data) { DWORD diffuseColor = *((DWORD *) data); glColor4ub(D3DCOLOR_B_R(diffuseColor), @@ -3933,14 +3933,14 @@ static void diffuse_d3dcolor(void *data) { D3DCOLOR_B_A(diffuseColor)); } -static void specular_d3dcolor(void *data) { +static void WINE_GLAPI specular_d3dcolor(void *data) { DWORD specularColor = *((DWORD *) data); GL_EXTCALL(glSecondaryColor3ubEXT)(D3DCOLOR_B_R(specularColor), D3DCOLOR_B_G(specularColor), D3DCOLOR_B_B(specularColor)); } -static void warn_no_specular_func(void *data) { +static void WINE_GLAPI warn_no_specular_func(void *data) { WARN("GL_EXT_secondary_color not supported\n"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c72afe6..c00300d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -463,8 +463,8 @@ void primitiveDeclarationConvertToStridedData( DWORD get_flexible_vertex_size(DWORD d3dvtVertexType); -typedef void (*glAttribFunc)(void *data); -typedef void (*glTexAttribFunc)(GLuint unit, void *data); +typedef void (WINE_GLAPI *glAttribFunc)(void *data); +typedef void (WINE_GLAPI *glTexAttribFunc)(GLuint unit, void *data); extern glAttribFunc position_funcs[WINED3DDECLTYPE_UNUSED]; extern glAttribFunc diffuse_funcs[WINED3DDECLTYPE_UNUSED]; extern glAttribFunc specular_funcs[WINED3DDECLTYPE_UNUSED];

1 0

Stefan Dösinger : wined3d: Disable D3DFMT_A2W10V10U10.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: ec633bf789fce42b59eaca805fefd582becddd4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec633bf789fce42b59eaca805… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 15 15:08:29 2008 +0200 wined3d: Disable D3DFMT_A2W10V10U10. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 42b7388..5120c5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2261,7 +2261,6 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE case WINED3DFMT_Q8W8V8U8: case WINED3DFMT_V16U16: case WINED3DFMT_W11V11U10: - case WINED3DFMT_A2W10V10U10: getFormatDescEntry(CheckFormat, &GLINFO_LOCATION, &glDesc); if(glDesc->conversion_group == WINED3DFMT_UNKNOWN) { /* We have a GL extension giving native support */ @@ -2301,6 +2300,7 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE case WINED3DFMT_INDEX16: case WINED3DFMT_INDEX32: case WINED3DFMT_Q16W16V16U16: + case WINED3DFMT_A2W10V10U10: TRACE_(d3d_caps)("[FAILED]\n"); /* Enable when implemented */ return FALSE;

1 0

Stefan Dösinger : wined3d: Add fixed function sRGB write correction.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: f39e1224774a4f975951ccbc7dab6dac55e0670b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f39e1224774a4f975951ccbc7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 20 10:15:31 2008 -0500 wined3d: Add fixed function sRGB write correction. --- dlls/wined3d/arb_program_shader.c | 64 +++++++++++++++++++++++++----------- dlls/wined3d/utils.c | 5 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 50 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bc8d3b3..a701f36 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1958,6 +1958,28 @@ static BOOL shader_arb_dirty_const(IWineD3DDevice *iface) { return TRUE; } +static void arbfp_add_sRGB_correction(SHADER_BUFFER *buffer, const char *fragcolor, const char *tmp1, + const char *tmp2, const char *tmp3, const char *tmp4) { + /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ + + /* Calculate the > 0.0031308 case */ + shader_addline(buffer, "POW %s.x, %s.x, srgb_pow.x;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.y, %s.y, srgb_pow.y;\n", tmp1, fragcolor); + shader_addline(buffer, "POW %s.z, %s.z, srgb_pow.z;\n", tmp1, fragcolor); + shader_addline(buffer, "MUL %s, %s, srgb_mul_hi;\n", tmp1, tmp1); + shader_addline(buffer, "SUB %s, %s, srgb_sub_hi;\n", tmp1, tmp1); + /* Calculate the < case */ + shader_addline(buffer, "MUL %s, srgb_mul_low, %s;\n", tmp2, fragcolor); + /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ + shader_addline(buffer, "SLT %s, srgb_comparison, %s;\n", tmp3, fragcolor); + shader_addline(buffer, "SGE %s, srgb_comparison, %s;\n", tmp4, fragcolor); + /* Store the components > 0.0031308 in the destination */ + shader_addline(buffer, "MUL %s, %s, %s;\n", fragcolor, tmp1, tmp3); + /* Add the components that are < 0.0031308 */ + shader_addline(buffer, "MAD result.color.xyz, %s, %s, %s;\n", tmp2, tmp4, fragcolor); + /* [0.0;1.0] clamping. Not needed, this is done implicitly */ +} + static void shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFER *buffer) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)iface; shader_reg_maps* reg_maps = &This->baseShader.reg_maps; @@ -2002,24 +2024,7 @@ static void shader_arb_generate_pshader(IWineD3DPixelShader *iface, SHADER_BUFFE fragcolor = "TMP_COLOR"; } if(This->srgb_enabled) { - /* Perform sRGB write correction. See GLX_EXT_framebuffer_sRGB */ - - /* Calculate the > 0.0031308 case */ - shader_addline(buffer, "POW TMP.x, %s.x, srgb_pow.x;\n", fragcolor); - shader_addline(buffer, "POW TMP.y, %s.y, srgb_pow.y;\n", fragcolor); - shader_addline(buffer, "POW TMP.z, %s.z, srgb_pow.z;\n", fragcolor); - shader_addline(buffer, "MUL TMP, TMP, srgb_mul_hi;\n"); - shader_addline(buffer, "SUB TMP, TMP, srgb_sub_hi;\n"); - /* Calculate the < case */ - shader_addline(buffer, "MUL TMP2, srgb_mul_low, %s;\n", fragcolor); - /* Get 1.0 / 0.0 masks for > 0.0031308 and < 0.0031308 */ - shader_addline(buffer, "SLT TA, srgb_comparison, %s;\n", fragcolor); - shader_addline(buffer, "SGE TB, srgb_comparison, %s;\n", fragcolor); - /* Store the components > 0.0031308 in the destination */ - shader_addline(buffer, "MUL %s, TMP, TA;\n", fragcolor); - /* Add the components that are < 0.0031308 */ - shader_addline(buffer, "MAD result.color.xyz, TMP2, TB, %s;\n", fragcolor); - /* [0.0;1.0] clamping. Not needed, this is done implicitly */ + arbfp_add_sRGB_correction(buffer, fragcolor, "TMP", "TMP2", "TA", "TB"); } if (This->baseShader.hex_version < WINED3DPS_VERSION(3,0)) { shader_addline(buffer, "LRP result.color.rgb, TMP_FOG.x, %s, state.fog.color;\n", fragcolor); @@ -2644,7 +2649,7 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB shader_addline(&buffer, "PARAM const = {1, 2, 4, 0.5};\n"); shader_addline(&buffer, "TEMP ret;\n"); - if(tempreg_used) shader_addline(&buffer, "TEMP tempreg;\n"); + if(tempreg_used || settings->sRGB_write) shader_addline(&buffer, "TEMP tempreg;\n"); shader_addline(&buffer, "TEMP arg0;\n"); shader_addline(&buffer, "TEMP arg1;\n"); shader_addline(&buffer, "TEMP arg2;\n"); @@ -2658,6 +2663,19 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB shader_addline(&buffer, "PARAM tfactor = program.env[%u];\n", ARB_FFP_CONST_TFACTOR); } + if(settings->sRGB_write) { + shader_addline(&buffer, "PARAM srgb_mul_low = {%f, %f, %f, 1.0};\n", + srgb_mul_low, srgb_mul_low, srgb_mul_low); + shader_addline(&buffer, "PARAM srgb_comparison = {%f, %f, %f, %f};\n", + srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp); + shader_addline(&buffer, "PARAM srgb_pow = {%f, %f, %f, 1.0};\n", + srgb_pow, srgb_pow, srgb_pow); + shader_addline(&buffer, "PARAM srgb_mul_hi = {%f, %f, %f, 1.0};\n", + srgb_mul_high, srgb_mul_high, srgb_mul_high); + shader_addline(&buffer, "PARAM srgb_sub_hi = {%f, %f, %f, 0.0};\n", + srgb_sub_high, srgb_sub_high, srgb_sub_high); + } + /* Generate texture sampling instructions) */ for(stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3DTOP_DISABLE; stage++) { if(!tex_read[stage]) continue; @@ -2714,6 +2732,8 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB shader_addline(&buffer, "MOV result.color, fragment.color.primary;\n"); } break; + } else if(settings->sRGB_write) { + last = FALSE; } else if(stage == (MAX_TEXTURES - 1)) { last = TRUE; } else if(settings->op[stage + 1].cop == WINED3DTOP_DISABLE) { @@ -2748,7 +2768,10 @@ static GLuint gen_arbfp_ffp_shader(struct ffp_settings *settings, IWineD3DStateB } } - /* TODO: Generate sRGB write color correction */ + if(settings->sRGB_write) { + arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg"); + shader_addline(&buffer, "MOV result.color.a, ret.a;\n"); + } /* Footer */ shader_addline(&buffer, "END\n"); @@ -2976,6 +2999,7 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { { STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, + { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, {0 /* Terminate */, { 0, 0 }, 0 }, }; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 91c8c37..8501544 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1976,6 +1976,11 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting break; } } + if(stateblock->renderState[WINED3DRS_SRGBWRITEENABLE]) { + settings->sRGB_write = 1; + } else { + settings->sRGB_write = 0; + } } #undef GLINFO_LOCATION diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e67ec38..c72afe6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -785,6 +785,7 @@ struct ffp_settings { FOG_EXP, FOG_EXP2 } fog; + unsigned char sRGB_write; }; struct ffp_desc

1 0

Stefan Dösinger : wined3d: Disable D3DFMT_A4L4.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 1043a046732383e67aba8888694d332fa21363a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1043a046732383e67aba88886… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 15 13:49:20 2008 +0200 wined3d: Disable D3DFMT_A4L4. --- dlls/wined3d/directx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6fe5374..42b7388 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2228,11 +2228,15 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE */ case WINED3DFMT_L8: case WINED3DFMT_A8L8: - case WINED3DFMT_A4L4: case WINED3DFMT_L16: TRACE_(d3d_caps)("[OK]\n"); return TRUE; + /* Not supported on Windows, thus disabled */ + case WINED3DFMT_A4L4: + TRACE_(d3d_caps)("[FAILED] - not supported on windows\n"); + return FALSE; + /***** * Supported: Depth/Stencil formats */

1 0

Stefan Dösinger : wined3d: Remove a few texture initializations.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: ba58adaaf692f0f5dbf3eec0a1d224b7d4d9d95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba58adaaf692f0f5dbf3eec0a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 13 13:00:43 2008 -0500 wined3d: Remove a few texture initializations. This is done by LoadLocation now. --- dlls/wined3d/surface.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0628e5a..c8c1e0f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1312,14 +1312,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { case RTL_READTEX: case RTL_TEXTEX: ActivateContext(myDevice, iface, CTXUSAGE_BLIT); - ENTER_GL(); - if (This->glDescription.textureName == 0) { - glGenTextures(1, &This->glDescription.textureName); - checkGLcall("glGenTextures"); - } - glBindTexture(This->glDescription.target, This->glDescription.textureName); - checkGLcall("glBindTexture(This->glDescription.target, This->glDescription.textureName)"); - LEAVE_GL(); IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */); /* drop through */ @@ -3804,15 +3796,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && (convert == NO_CONVERSION)) { - ENTER_GL(); - if (This->glDescription.textureName == 0) { - glGenTextures(1, &This->glDescription.textureName); - checkGLcall("glGenTextures"); - } - glBindTexture(This->glDescription.target, This->glDescription.textureName); - checkGLcall("glBindTexture(This->glDescription.target, This->glDescription.textureName)"); - LEAVE_GL(); - /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL);

1 0

Stefan Dösinger : wined3d: Get a GL context before creating a PBO.
by Alexandre Julliard 25 Aug '08

25 Aug '08

Module: wine Branch: master Commit: 6c87a66355025289c3f33778e7c14ff87f8d849c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c87a66355025289c3f33778e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 15 16:45:51 2008 -0500 wined3d: Get a GL context before creating a PBO. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c8c1e0f..a988121 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -955,6 +955,9 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { */ if(GL_SUPPORT(ARB_PIXEL_BUFFER_OBJECT) && (This->Flags & SFLAG_DYNLOCK) && !(This->Flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2)) && (This->resource.pool != WINED3DPOOL_SYSTEMMEM)) { GLenum error; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); ENTER_GL(); GL_EXTCALL(glGenBuffersARB(1, &This->pbo));

1 0