wine-commits October 2008

wine-commits@winehq.org

3 participants
1216 discussions

Roderick Colenbrander : wined3d: Remove ENTER_GL/ LEAVE_GL from VolumeTexture_PreLoad because it doesn't make any GL calls.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 728e61e78bf4171f8754fe175f53ad208662632d URL: http://source.winehq.org/git/wine.git/?a=commit;h=728e61e78bf4171f8754fe175… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Oct 19 00:13:20 2008 +0000 wined3d: Remove ENTER_GL/LEAVE_GL from VolumeTexture_PreLoad because it doesn't make any GL calls. --- dlls/wined3d/volumetexture.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 035cf90..53275e1 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -107,7 +107,7 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *ifac srgb_was_toggled = This->baseTexture.is_srgb != srgb_mode; This->baseTexture.is_srgb = srgb_mode; } - ENTER_GL(); + /* If the texture is marked dirty or the srgb sampler setting has changed since the last load then reload the surfaces */ if (This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) @@ -125,7 +125,6 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *ifac } else { TRACE("(%p) Texture not dirty, nothing to do\n" , iface); } - LEAVE_GL(); /* No longer dirty */ This->baseTexture.dirty = FALSE;

1 0

Roderick Colenbrander : wined3d: Protect gl calls in Volume_LoadTexture with ENTER_GL/LEAVE_GL.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 3e3141da3481ea42b868645232b0a7ce786c8c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3141da3481ea42b86864523… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Oct 19 00:07:49 2008 +0000 wined3d: Protect gl calls in Volume_LoadTexture with ENTER_GL/LEAVE_GL. --- dlls/wined3d/volume.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 36f0495..8faef0c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -328,6 +328,8 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int glDesc->glFormat, glDesc->glType, This->resource.allocatedMemory); + + ENTER_GL(); GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, gl_level, glDesc->glInternal, @@ -339,6 +341,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int glDesc->glType, This->resource.allocatedMemory)); checkGLcall("glTexImage3D"); + LEAVE_GL(); /* When adding code releasing This->resource.allocatedMemory to save data keep in mind that * GL_UNPACK_CLIENT_STORAGE_APPLE is enabled by default if supported(GL_APPLE_client_storage).

1 0

Roderick Colenbrander : wined3d: Fix recursive ENTER_GL in UpdateSurface.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 47372928b8fcc978954523bc8e6cb59b0c5941fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=47372928b8fcc978954523bc8… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Oct 19 00:05:10 2008 +0000 wined3d: Fix recursive ENTER_GL in UpdateSurface. --- dlls/wined3d/device.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 185dbef..9a35d18 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5880,11 +5880,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - ENTER_GL(); - if (GL_SUPPORT(ARB_MULTITEXTURE)) { + ENTER_GL(); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); checkGLcall("glActiveTextureARB"); + LEAVE_GL(); } /* Make sure the surface is loaded and up to date */ @@ -5924,6 +5924,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, FIXME("Surfaces has no allocated memory, but should be an in memory only surface\n"); } + ENTER_GL(); + /* TODO: Cube and volume support */ if(rowoffset != 0){ /* not a whole row so we have to do it a line at a time */

1 0

Roderick Colenbrander : wined3d: ActivateContext caused a lot of recursive ENTER_GL calls while it is especially dangerous in here as this function can indirectly trigger GDI calls .
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: e848aed2b8f77b8c76b63e5dfb2ab7870aed265b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e848aed2b8f77b8c76b63e5df… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 18 23:57:36 2008 +0000 wined3d: ActivateContext caused a lot of recursive ENTER_GL calls while it is especially dangerous in here as this function can indirectly trigger GDI calls. --- dlls/wined3d/context.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0b2fab3..62a4bf4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1056,6 +1056,13 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex Context_MarkStateDirty(context, STATE_VSHADER, StateTable); Context_MarkStateDirty(context, STATE_PIXELSHADER, StateTable); + /* Call ENTER_GL() once for all gl calls below. In theory we should not call + * helper functions in between gl calls. This function is full of Context_MarkStateDirty + * which can safely be called from here, we only lock once instead locking/unlocking + * after each GL call. + */ + ENTER_GL(); + /* Disable all textures. The caller can then bind a texture it wants to blit * from */ @@ -1188,6 +1195,7 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)"); glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)"); Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_CLIPPING), StateTable); + LEAVE_GL(); set_blit_dimension(width, height); context->blit_w = width; context->blit_h = height; @@ -1416,11 +1424,14 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { IWineD3DSwapChain_Release((IUnknown *)swapchain); + ENTER_GL(); glDrawBuffer(surface_get_gl_buffer(target, swapchain)); checkGLcall("glDrawBuffers()"); + LEAVE_GL(); } else { + ENTER_GL(); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (!blit) @@ -1445,6 +1456,7 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, glDrawBuffer(This->offscreenBuffer); checkGLcall("glDrawBuffer()"); } + LEAVE_GL(); } } @@ -1512,9 +1524,6 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU last_device = This; } - /* We only need ENTER_GL for the gl calls made below and for the helper functions which make GL calls */ - ENTER_GL(); - switch (usage) { case CTXUSAGE_CLEAR: case CTXUSAGE_DRAWPRIM: @@ -1533,11 +1542,16 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU FIXME("Activating for CTXUSAGE_BLIT for an offscreen target with ORM_FBO. This should be avoided.\n"); context_bind_fbo((IWineD3DDevice *)This, GL_FRAMEBUFFER_EXT, &context->dst_fbo); context_attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, 0, target); + + ENTER_GL(); GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, 0)); checkGLcall("glFramebufferRenderbufferEXT"); + LEAVE_GL(); } else { + ENTER_GL(); GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); checkGLcall("glFramebufferRenderbufferEXT"); + LEAVE_GL(); } context->draw_buffer_dirty = TRUE; } @@ -1566,11 +1580,15 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU /* Blending and clearing should be orthogonal, but tests on the nvidia driver show that disabling * blending when clearing improves the clearing performance incredibly. */ + ENTER_GL(); glDisable(GL_BLEND); + LEAVE_GL(); Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); + ENTER_GL(); glEnable(GL_SCISSOR_TEST); checkGLcall("glEnable GL_SCISSOR_TEST"); + LEAVE_GL(); context->last_was_blit = FALSE; Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), StateTable); Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); @@ -1604,5 +1622,4 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU default: FIXME("Unexpected context usage requested\n"); } - LEAVE_GL(); }

1 0

Roderick Colenbrander : wined3d: Fix recursive ENTER_GL in LoadLocation.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: b98a7b50824fee0e01c93c26da1098602567d946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98a7b50824fee0e01c93c26d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 18 23:29:42 2008 +0000 wined3d: Fix recursive ENTER_GL in LoadLocation. --- dlls/wined3d/surface.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a91da6c..953985b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4420,7 +4420,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D if(!device->isInDraw) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); surface_bind_and_dirtify(This); - ENTER_GL(); /* The only place where LoadTexture() might get called when isInDraw=1 * is ActivateContext where lastActiveRenderTarget is preloaded. @@ -4472,7 +4471,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } /* Make sure the correct pitch is used */ + ENTER_GL(); glPixelStorei(GL_UNPACK_ROW_LENGTH, width); + LEAVE_GL(); if ((This->Flags & SFLAG_NONPOW2) && !(This->Flags & SFLAG_OVERSIZE)) { TRACE("non power of two support\n"); @@ -4495,6 +4496,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } /* Restore the default pitch */ + ENTER_GL(); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); LEAVE_GL();

1 0

Roderick Colenbrander : wined3d: Fix a recursive ENTER_GL in read_from_framebuffer.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: e5ed8edb89bb08dcc76e13af39751f29f55fc466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ed8edb89bb08dcc76e13af3… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 18 23:21:46 2008 +0000 wined3d: Fix a recursive ENTER_GL in read_from_framebuffer. --- dlls/wined3d/surface.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2d6a097..a91da6c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -916,9 +916,10 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) */ ActivateContext(device, (IWineD3DSurface *) This, CTXUSAGE_RESOURCELOAD); surface_bind_and_dirtify(This); - ENTER_GL(); + ENTER_GL(); glGetIntegerv(GL_READ_BUFFER, &prevRead); + LEAVE_GL(); /* Select the correct read buffer, and give some debug output. * There is no need to keep track of the current read buffer or reset it, every part of the code @@ -928,8 +929,11 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) { GLenum buffer = surface_get_gl_buffer((IWineD3DSurface *) This, (IWineD3DSwapChain *)swapchain); TRACE("Locking %#x buffer\n", buffer); + + ENTER_GL(); glReadBuffer(buffer); checkGLcall("glReadBuffer"); + LEAVE_GL(); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); } else { @@ -937,7 +941,9 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) * Read from the back buffer */ TRACE("Locking offscreen render target\n"); + ENTER_GL(); glReadBuffer(device->offscreenBuffer); + LEAVE_GL(); } if(!(This->Flags & SFLAG_ALLOCATED)) { @@ -947,6 +953,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This) clear_unused_channels(This); + ENTER_GL(); /* If !SrcIsUpsideDown we should flip the surface. * This can be done using glCopyTexSubImage2D but this * is VERY slow, so don't do that. We should prevent

1 0

Roderick Colenbrander : wined3d: Prevent a recursive ENTER_GL before calling blitter->free_private.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: d4b4810ebeb59c605307a5b273d5b3b957617c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b4810ebeb59c605307a5b27… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 18 23:21:06 2008 +0000 wined3d: Prevent a recursive ENTER_GL before calling blitter->free_private. --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 48ddbd8..185dbef 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7015,10 +7015,13 @@ void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_ This->depth_blt_rb_w = 0; This->depth_blt_rb_h = 0; } + LEAVE_GL(); + This->blitter->free_private(iface); This->frag_pipe->free_private(iface); This->shader_backend->shader_free_private(iface); + ENTER_GL(); for (i = 0; i < GL_LIMITS(textures); i++) { /* Textures are recreated below */ glDeleteTextures(1, &This->dummyTextureName[i]);

1 0

Roderick Colenbrander : wined3d: Add ENTER_GL/LEAVE_GL to gen_yuv_shader.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 3a1aeef7c7c9f629ff9f79a94bc9970434b4890a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1aeef7c7c9f629ff9f79a94… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 18 17:39:06 2008 +0000 wined3d: Add ENTER_GL/LEAVE_GL to gen_yuv_shader. --- dlls/wined3d/arb_program_shader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9923749..2494ced 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3539,10 +3539,12 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, WINED3DFORMAT fmt, GLen buffer.newline = TRUE; buffer.buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SHADER_PGMSIZE); + ENTER_GL(); GL_EXTCALL(glGenProgramsARB(1, &shader)); checkGLcall("GL_EXTCALL(glGenProgramsARB(1, &shader))"); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"); + LEAVE_GL(); if(!shader) { HeapFree(GetProcessHeap(), 0, buffer.buffer); return 0; @@ -3617,6 +3619,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, WINED3DFORMAT fmt, GLen shader_addline(&buffer, "MAD result.color.b, chroma.g, yuv_coef.w, luminance.%c;\n", luminance_component); shader_addline(&buffer, "END\n"); + ENTER_GL(); GL_EXTCALL(glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(buffer.buffer), buffer.buffer)); if (glGetError() == GL_INVALID_OPERATION) { @@ -3626,6 +3629,7 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, WINED3DFORMAT fmt, GLen debugstr_a((const char *)glGetString(GL_PROGRAM_ERROR_STRING_ARB))); } HeapFree(GetProcessHeap(), 0, buffer.buffer); + LEAVE_GL(); if(fmt == WINED3DFMT_YUY2) { if(textype == GL_TEXTURE_RECTANGLE_ARB) {

1 0

Roderick Colenbrander : wined3d: arbfp_blit_unset should call ENTER_GL/ LEAVE_GL instead of the caller.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 5163a360e05b7a4e23e3d45afc910ff3707fedcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5163a360e05b7a4e23e3d45af… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 18 17:35:45 2008 +0000 wined3d: arbfp_blit_unset should call ENTER_GL/LEAVE_GL instead of the caller. --- dlls/wined3d/arb_program_shader.c | 3 +++ dlls/wined3d/surface.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2727124..9923749 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3707,6 +3707,8 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum t static void arbfp_blit_unset(IWineD3DDevice *iface) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; + + ENTER_GL(); glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); glDisable(GL_TEXTURE_2D); @@ -3719,6 +3721,7 @@ static void arbfp_blit_unset(IWineD3DDevice *iface) { glDisable(GL_TEXTURE_RECTANGLE_ARB); checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); } + LEAVE_GL(); } static BOOL arbfp_blit_conv_supported(WINED3DFORMAT fmt) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 53392a5..2d6a097 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3556,8 +3556,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * glBindTexture(Src->glDescription.target, 0); checkGLcall("glBindTexture(Src->glDescription.target, 0)"); - /* Leave the opengl state valid for blitting */ - myDevice->blitter->unset_shader((IWineD3DDevice *) myDevice); /* Restore the color key parameters */ Src->CKeyFlags = oldCKeyFlags; @@ -3569,6 +3567,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * LEAVE_GL(); + /* Leave the opengl state valid for blitting */ + myDevice->blitter->unset_shader((IWineD3DDevice *) myDevice); + /* Flush in case the drawable is used by multiple GL contexts */ if(dstSwapchain && (This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer || dstSwapchain->num_contexts >= 2)) glFlush();

1 0

Roderick Colenbrander : wined3d: arbfp_set_shader_blit should handle ENTER_GL/ LEAVE_GL instead of the caller.
by Alexandre Julliard 20 Oct '08

20 Oct '08

Module: wine Branch: master Commit: 8a002b09c1513c47a8e07969ccc458d758b03d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a002b09c1513c47a8e07969c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sat Oct 18 17:33:15 2008 +0000 wined3d: arbfp_set_shader_blit should handle ENTER_GL/LEAVE_GL instead of the caller. --- dlls/wined3d/arb_program_shader.c | 4 ++++ dlls/wined3d/surface.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c457b32..2727124 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3662,8 +3662,10 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum t glDesc->conversion_group != WINED3DFMT_YV12) { TRACE("Format: %s\n", debug_d3dformat(glDesc->conversion_group)); /* Don't bother setting up a shader for unconverted formats */ + ENTER_GL(); glEnable(textype); checkGLcall("glEnable(textype)"); + LEAVE_GL(); return WINED3D_OK; } @@ -3691,12 +3693,14 @@ static HRESULT arbfp_blit_set(IWineD3DDevice *iface, WINED3DFORMAT fmt, GLenum t shader = gen_yuv_shader(device, glDesc->conversion_group, textype); } + ENTER_GL(); glEnable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)); checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, shader)"); GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0, size)); checkGLcall("glProgramLocalParameter4fvARB"); + LEAVE_GL(); return WINED3D_OK; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7a42e5a..53392a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3485,10 +3485,11 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * rect.y1 += This->currentDesc.Height - h; rect.y2 += This->currentDesc.Height - h; } - ENTER_GL(); myDevice->blitter->set_shader((IWineD3DDevice *) myDevice, Src->resource.format, Src->glDescription.target, Src->pow2Width, Src->pow2Height); + ENTER_GL(); + /* Bind the texture */ glBindTexture(Src->glDescription.target, Src->glDescription.textureName); checkGLcall("glBindTexture");

1 0

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 October 2008