July 2009 - Wine-commits - list.winehq.org

Tobias Jakobi : wined3d: Add NP2 fixup code to shader_hw_sample (ARB).
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: e29babbf6d2e90fc0166ec5672e4c5d5f6449d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e29babbf6d2e90fc0166ec567… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:48 2009 +0200 wined3d: Add NP2 fixup code to shader_hw_sample (ARB). --- dlls/wined3d/arb_program_shader.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 87b74b2..2c0c767 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1142,6 +1142,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD SHADER_BUFFER *buffer = ins->ctx->buffer; DWORD sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; const char *tex_type; + BOOL np2_fixup = FALSE; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; @@ -1165,9 +1166,10 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD } if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - if(priv->cur_ps_args->super.np2_fixup & (1 << sampler_idx)) + if (priv->cur_np2fixup_info->super.active & (1 << sampler_idx)) { - FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); + if (flags) FIXME("Only ordinary sampling from NP2 textures is supported.\n"); + else np2_fixup = TRUE; } } break; @@ -1224,7 +1226,16 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD } else { - shader_addline(buffer, "TEX%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); + if (np2_fixup) + { + const unsigned char idx = priv->cur_np2fixup_info->super.idx[sampler_idx]; + shader_addline(buffer, "MUL TA, np2fixup[%u].%s, %s;\n", idx >> 1, + (idx % 2) ? "zwxy" : "xyzw", coord_reg); + + shader_addline(buffer, "TEX%s %s, TA, texture[%u], %s;\n", mod, dst_str, sampler_idx, tex_type); + } + else + shader_addline(buffer, "TEX%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); } if (pshader)

1 0

Tobias Jakobi : wined3d: Implement shader_arb_load_np2fixup_constants.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: ef280280c2763cf4e65bb5101978fc8804cefa18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef280280c2763cf4e65bb5101… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:49 2009 +0200 wined3d: Implement shader_arb_load_np2fixup_constants. --- dlls/wined3d/arb_program_shader.c | 42 ++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2c0c767..75f05c8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -378,7 +378,47 @@ static void shader_arb_load_np2fixup_constants( IWineD3DDevice* device, char usePixelShader, char useVertexShader) { - /* not implemented */ + + IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl *) device; + const struct shader_arb_priv* const priv = (const struct shader_arb_priv *) deviceImpl->shader_priv; + IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; + const WineD3D_GL_Info *gl_info = &deviceImpl->adapter->gl_info; + + if (!usePixelShader) { + /* NP2 texcoord fixup is (currently) only done for pixelshaders. */ + return; + } + + if (priv->compiled_fprog && priv->compiled_fprog->np2fixup_info.super.active) { + const struct arb_ps_np2fixup_info* const fixup = &priv->compiled_fprog->np2fixup_info; + UINT i; + WORD active = fixup->super.active; + GLfloat np2fixup_constants[4 * MAX_FRAGMENT_SAMPLERS]; + + for (i = 0; active; active >>= 1, ++i) { + const unsigned char idx = fixup->super.idx[i]; + const IWineD3DTextureImpl* const tex = (const IWineD3DTextureImpl*) stateBlock->textures[i]; + GLfloat* tex_dim = &np2fixup_constants[(idx >> 1) * 4]; + + if (!(active & 1)) continue; + + if (!tex) { + FIXME("Nonexistent texture is flagged for NP2 texcoord fixup\n"); + continue; + } + + if (idx % 2) { + tex_dim[2] = tex->baseTexture.pow2Matrix[0]; tex_dim[3] = tex->baseTexture.pow2Matrix[5]; + } else { + tex_dim[0] = tex->baseTexture.pow2Matrix[0]; tex_dim[1] = tex->baseTexture.pow2Matrix[5]; + } + } + + for (i = 0; i < fixup->super.num_consts; ++i) { + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, + fixup->offset + i, &np2fixup_constants[i * 4])); + } + } } /* GL locking is done by the caller. */

1 0

Tobias Jakobi : wined3d: Force NP2 constant reload in shader_arb_select.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 0caebe5f514e1e34f646197bc2d909cc5e7697eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0caebe5f514e1e34f646197bc… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:50 2009 +0200 wined3d: Force NP2 constant reload in shader_arb_select. --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 75f05c8..cdc5b10 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4248,6 +4248,9 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { { shader_arb_ps_local_constants(This); } + + /* Force constant reloading for the NP2 fixup (see comment in shader_glsl_select for more info) */ + if (compiled->np2fixup_info.super.active) This->shader_backend->shader_load_np2fixup_constants(iface, usePS, useVS); } else if(GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && !priv->use_arbfp_fixed_func) { /* Disable only if we're not using arbfp fixed function fragment processing. If this is used, * keep GL_FRAGMENT_PROGRAM_ARB enabled, and the fixed function pipeline will bind the fixed function

1 0

Tobias Jakobi : wined3d: Fix comments about NP2 fixup.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 05c4d0a8b0a98c5b16a7ccf36d94aabf57abb87f URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c4d0a8b0a98c5b16a7ccf36… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Wed Jul 1 18:36:51 2009 +0200 wined3d: Fix comments about NP2 fixup. --- dlls/wined3d/state.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 855bb59..8d441b7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3035,8 +3035,8 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(generated) { FIXME("Non-power2 texture being used with generated texture coords\n"); } - /* NP2 texcoord fixup is implemented for pixelshaders (currently only in GLSL backend) so - only enable the fixed-function-pipeline fixup via pow2Matrix when no PS is used. */ + /* NP2 texcoord fixup is implemented for pixelshaders so only enable the + fixed-function-pipeline fixup via pow2Matrix when no PS is used. */ if (!use_ps(stateblock)) { TRACE("Non power two matrix multiply fixup\n"); glMultMatrixf(((IWineD3DTextureImpl *) stateblock->textures[texUnit])->baseTexture.pow2Matrix); @@ -3379,8 +3379,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } } - /* Trigger shader constant reloading (for NP2 texcoord fixup) - * Only do this if pshaders are used (note: fixup is currently only implemented in GLSL). */ + /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!tex_impl->baseTexture.pow2Matrix_identity) { IWineD3DDeviceImpl* d3ddevice = stateblock->wineD3DDevice; d3ddevice->shader_backend->shader_load_np2fixup_constants(

1 0

Nikolay Sivov : comctl32/listview: Fix select rectangle calculation for empty text items.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 216ca479f2d18cbcd916525155b62f5a3bc34164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=216ca479f2d18cbcd91652515… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 2 02:42:43 2009 +0400 comctl32/listview: Fix select rectangle calculation for empty text items. --- dlls/comctl32/listview.c | 12 ++++++++++-- dlls/comctl32/tests/listview.c | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d7a5f97..2a66152 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -360,6 +360,8 @@ typedef struct tagLISTVIEW_INFO /* default label width for items in list and small icon display modes */ #define DEFAULT_LABEL_WIDTH 40 +/* maximum select rectangle width for empty text item in LV_VIEW_DETAILS */ +#define MAX_EMPTYTEXT_SELECT_WIDTH 80 /* default column width for items in list display mode */ #define DEFAULT_COLUMN_WIDTH 128 @@ -2235,7 +2237,9 @@ static void LISTVIEW_GetItemMetrics(const LISTVIEW_INFO *infoPtr, const LVITEMW DrawTextW (hdc, lpLVItem->pszText, -1, &rcText, uFormat | DT_CALCRECT); - labelSize.cx = min(rcText.right - rcText.left + TRAILING_LABEL_PADDING, infoPtr->nItemWidth); + if (rcText.right != rcText.left) + labelSize.cx = min(rcText.right - rcText.left + TRAILING_LABEL_PADDING, infoPtr->nItemWidth); + labelSize.cy = rcText.bottom - rcText.top; SelectObject(hdc, hOldFont); @@ -2288,7 +2292,11 @@ calc_label: SelectBox.left = Icon.left; SelectBox.top = Box.top; SelectBox.bottom = Box.bottom; - SelectBox.right = min(Label.left + labelSize.cx, Label.right); + + if (labelSize.cx) + SelectBox.right = min(Label.left + labelSize.cx, Label.right); + else + SelectBox.right = min(Label.left + MAX_EMPTYTEXT_SELECT_WIDTH, Label.right); } else { diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d11d9de..d5bcbf5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3067,7 +3067,7 @@ static void test_getitemrect(void) expect(TRUE, r); /* padding, column width */ expect(2, rect.left); - todo_wine expect(50, rect.right); + expect(50, rect.right); /* try with indentation */ item.mask = LVIF_INDENT; @@ -3093,7 +3093,7 @@ static void test_getitemrect(void) expect(TRUE, r); /* padding + 1 icon width, column width */ expect(2 + 16, rect.left); - todo_wine expect(50, rect.right); + expect(50, rect.right); /* label bounds */ rect.left = LVIR_LABEL;

1 0

Henri Verbeet : wined3d: Make sure the rtInternal format is supported.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 6feb7c62ca0a6be17055b1cb804bb68a371ef069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6feb7c62ca0a6be17055b1cb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 10:01:34 2009 +0200 wined3d: Make sure the rtInternal format is supported. --- dlls/wined3d/utils.c | 106 +++++++++++++++++++++++++++++++------------------ 1 files changed, 67 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7baf1d3..1d9f70c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -558,30 +558,90 @@ static BOOL init_format_compression_info(WineD3D_GL_Info *gl_info) #define GLINFO_LOCATION (*gl_info) /* Context activation is done by the caller. */ -static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_format, GLenum format, GLenum type) +static void check_fbo_compat(const WineD3D_GL_Info *gl_info, struct GlPixelFormatDesc *format_desc) { + /* Check if the default internal format is supported as a frame buffer + * target, otherwise fall back to the render target internal. + * + * Try to stick to the standard format if possible, this limits precision differences. */ GLenum status; GLuint tex; ENTER_GL(); while(glGetError()); + glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); - glTexImage2D(GL_TEXTURE_2D, 0, internal_format, 16, 16, 0, format, type, NULL); + + glTexImage2D(GL_TEXTURE_2D, 0, format_desc->glInternal, 16, 16, 0, + format_desc->glFormat, format_desc->glType, NULL); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex, 0)); status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); - glDeleteTextures(1, &tex); - checkGLcall("Framebuffer format check"); - LEAVE_GL(); + if (status == GL_FRAMEBUFFER_COMPLETE_EXT) + { + TRACE("Format %s is supported as FBO color attachment\n", debug_d3dformat(format_desc->format)); + format_desc->Flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE; + format_desc->rtInternal = format_desc->glInternal; + } + else + { + if (!format_desc->rtInternal) + { + if (format_desc->Flags & WINED3DFMT_FLAG_RENDERTARGET) + { + FIXME("Format %s with rendertarget flag is not supported as FBO color attachment," + " and no fallback specified.\n", debug_d3dformat(format_desc->format)); + format_desc->Flags &= ~WINED3DFMT_FLAG_RENDERTARGET; + } + else + { + TRACE("Format %s is not supported as FBO color attachment.\n", debug_d3dformat(format_desc->format)); + } + format_desc->rtInternal = format_desc->glInternal; + } + else + { + TRACE("Format %s is not supported as FBO color attachment, trying rtInternal format as fallback.\n", + debug_d3dformat(format_desc->format)); - return status == GL_FRAMEBUFFER_COMPLETE_EXT; + while(glGetError()); + + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, 0, 0)); + + glTexImage2D(GL_TEXTURE_2D, 0, format_desc->rtInternal, 16, 16, 0, + format_desc->glFormat, format_desc->glType, NULL); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex, 0)); + + status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); + checkGLcall("Framebuffer format check"); + + if (status == GL_FRAMEBUFFER_COMPLETE_EXT) + { + TRACE("Format %s rtInternal format is supported as FBO color attachment\n", + debug_d3dformat(format_desc->format)); + } + else + { + FIXME("Format %s rtInternal format is not supported as FBO color attachment.\n", + debug_d3dformat(format_desc->format)); + format_desc->Flags &= ~WINED3DFMT_FLAG_RENDERTARGET; + } + } + } + + glDeleteTextures(1, &tex); + + LEAVE_GL(); } /* Context activation is done by the caller. */ @@ -623,39 +683,7 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { TRACE("Checking if format %s is supported as FBO color attachment...\n", debug_d3dformat(desc->format)); - - /* Check if the default internal format is supported as a frame buffer target, otherwise - * fall back to the render target internal. - * - * Try to stick to the standard format if possible, this limits precision differences. */ - if (check_fbo_compat(gl_info, desc->glInternal, desc->glFormat, desc->glType)) - { - TRACE("Format %s is supported as FBO color attachment\n", debug_d3dformat(desc->format)); - desc->Flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE; - desc->rtInternal = desc->glInternal; - } - else - { - if (!desc->rtInternal) - { - if (desc->Flags & WINED3DFMT_FLAG_RENDERTARGET) - { - FIXME("Format %s with rendertarget flag is not supported as FBO color attachment," - " and no fallback specified.\n", debug_d3dformat(desc->format)); - desc->Flags &= ~WINED3DFMT_FLAG_RENDERTARGET; - } - else - { - TRACE("Format %s is not supported as FBO color attachment.\n", debug_d3dformat(desc->format)); - } - desc->rtInternal = desc->glInternal; - } - else - { - TRACE("Format %s is not supported as FBO color attachment, using rtInternal format as fallback.\n", - debug_d3dformat(desc->format)); - } - } + check_fbo_compat(gl_info, desc); } else {

1 0

Henri Verbeet : wined3d: Check if formats support blending when attached to an FBO.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 670d9ad90bf5af9bcb2e4c82d37391acbac83210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=670d9ad90bf5af9bcb2e4c82d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 10:01:35 2009 +0200 wined3d: Check if formats support blending when attached to an FBO. Remove the post-pixelshader blending flag if the format doesn't. Note that the patch doesn't enforce this restriction yet, it only adjusts the reported format capabilities. --- dlls/wined3d/utils.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1d9f70c..91e19f6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -570,6 +570,7 @@ static void check_fbo_compat(const WineD3D_GL_Info *gl_info, struct GlPixelForma ENTER_GL(); while(glGetError()); + glDisable(GL_BLEND); glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); @@ -639,6 +640,42 @@ static void check_fbo_compat(const WineD3D_GL_Info *gl_info, struct GlPixelForma } } + if (status == GL_FRAMEBUFFER_COMPLETE_EXT && format_desc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) + { + GLuint rb; + + if (GL_SUPPORT(EXT_PACKED_DEPTH_STENCIL)) + { + GL_EXTCALL(glGenRenderbuffersEXT(1, &rb)); + GL_EXTCALL(glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, rb)); + GL_EXTCALL(glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH24_STENCIL8_EXT, 16, 16)); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, rb)); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, rb)); + checkGLcall("RB attachment"); + } + + glEnable(GL_BLEND); + glClear(GL_COLOR_BUFFER_BIT); + if (glGetError() == GL_INVALID_FRAMEBUFFER_OPERATION_EXT) + { + while(glGetError()); + TRACE("Format doesn't support post-pixelshader blending.\n"); + format_desc->Flags &= ~WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; + } + + if (GL_SUPPORT(EXT_PACKED_DEPTH_STENCIL)) + { + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, 0)); + GL_EXTCALL(glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, + GL_RENDERBUFFER_EXT, 0)); + GL_EXTCALL(glDeleteRenderbuffersEXT(1, &rb)); + checkGLcall("RB cleanup"); + } + } + glDeleteTextures(1, &tex); LEAVE_GL();

1 0

Henri Verbeet : wined3d: Clear the last device in WineD3D_CreateFakeGLContext().
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: 50e9ad66e2d6b170d47b0e79cc4e04fb219a1455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e9ad66e2d6b170d47b0e79c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 10:01:36 2009 +0200 wined3d: Clear the last device in WineD3D_CreateFakeGLContext(). --- dlls/wined3d/context.c | 11 ++++++++--- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6be40c7..8fa9786 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -36,6 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); */ static IWineD3DDeviceImpl *last_device; +void context_set_last_device(IWineD3DDeviceImpl *device) +{ + last_device = device; +} + /* FBO helper functions */ /* GL locking is done by the caller */ @@ -1078,7 +1083,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar ERR("Failed to make previous GL context %p current.\n", oldCtx); } } else { - last_device = This; + context_set_last_device(This); } This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); @@ -1167,7 +1172,7 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { /* The correct GL context needs to be active to cleanup the GL resources below */ has_glctx = pwglMakeCurrent(context->hdc, context->glCtx); - last_device = NULL; + context_set_last_device(NULL); if (!has_glctx) WARN("Failed to activate context. Window already destroyed?\n"); @@ -1750,7 +1755,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU sizeof(*This->activeContext->pshader_const_dirty) * GL_LIMITS(pshader_constantsF)); } This->activeContext = context; - last_device = This; + context_set_last_device(This); } switch (usage) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4d16957..9e50b0d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -308,6 +308,7 @@ static BOOL WineD3D_CreateFakeGLContext(void) { goto fail; } } + context_set_last_device(NULL); ret: TRACE("incrementing ref from %i\n", wined3d_fake_gl_context_ref); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7af5719..c5ba435 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1256,6 +1256,7 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource void context_bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo); void context_attach_depth_stencil_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, IWineD3DSurface *depth_stencil, BOOL use_render_buffer); void context_attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface); +void context_set_last_device(IWineD3DDeviceImpl *device); void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain); HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain);

1 0

Henri Verbeet : wined3d: Don' t reuse random GL contexts during initialization.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: b5da7f49d332ed5d64be1256e14035af74a7efa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5da7f49d332ed5d64be1256e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 10:01:37 2009 +0200 wined3d: Don't reuse random GL contexts during initialization. Obviously there's no guarantee about the state of such a context. The specific problem is that it might have GL_UNPACK_CLIENT_STORAGE_APPLE enabled, causing some glTexImage2D() calls to fail, but it's a bad idea in general. --- dlls/wined3d/directx.c | 99 ++++++++++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9e50b0d..13651e6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -198,7 +198,6 @@ glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT]; */ static int wined3d_fake_gl_context_ref = 0; -static BOOL wined3d_fake_gl_context_foreign; static BOOL wined3d_fake_gl_context_available = FALSE; static HDC wined3d_fake_gl_context_hdc = NULL; static HWND wined3d_fake_gl_context_hwnd = NULL; @@ -228,7 +227,8 @@ static void WineD3D_ReleaseFakeGLContext(void) { TRACE_(d3d_caps)("decrementing ref from %i\n", wined3d_fake_gl_context_ref); if (0 == (--wined3d_fake_gl_context_ref) ) { - if(!wined3d_fake_gl_context_foreign && glCtx) { + if (glCtx) + { TRACE_(d3d_caps)("destroying fake GL context\n"); if (!pwglMakeCurrent(NULL, NULL)) { @@ -249,64 +249,63 @@ static void WineD3D_ReleaseFakeGLContext(void) { } static BOOL WineD3D_CreateFakeGLContext(void) { + PIXELFORMATDESCRIPTOR pfd; HGLRC glCtx = NULL; + int iPixelFormat; EnterCriticalSection(&wined3d_fake_gl_context_cs); TRACE("getting context...\n"); if(wined3d_fake_gl_context_ref > 0) goto ret; - wined3d_fake_gl_context_foreign = TRUE; - - glCtx = pwglGetCurrentContext(); - if (!glCtx) { - PIXELFORMATDESCRIPTOR pfd; - int iPixelFormat; + /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ + wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); + if (!wined3d_fake_gl_context_hwnd) + { + ERR("HWND creation failed!\n"); + goto fail; + } - wined3d_fake_gl_context_foreign = FALSE; + wined3d_fake_gl_context_hdc = GetDC(wined3d_fake_gl_context_hwnd); + if (!wined3d_fake_gl_context_hdc) + { + ERR("GetDC failed!\n"); + goto fail; + } - /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes */ - wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); - if(!wined3d_fake_gl_context_hwnd) { - ERR("HWND creation failed!\n"); - goto fail; - } - wined3d_fake_gl_context_hdc = GetDC(wined3d_fake_gl_context_hwnd); - if(!wined3d_fake_gl_context_hdc) { - ERR("GetDC failed!\n"); - goto fail; - } + /* PixelFormat selection */ + ZeroMemory(&pfd, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW; /* PFD_GENERIC_ACCELERATED */ + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.cColorBits = 32; + pfd.iLayerType = PFD_MAIN_PLANE; + + iPixelFormat = ChoosePixelFormat(wined3d_fake_gl_context_hdc, &pfd); + if (!iPixelFormat) + { + /* If this happens something is very wrong as ChoosePixelFormat barely fails. */ + ERR("Can't find a suitable iPixelFormat.\n"); + goto fail; + } + DescribePixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, sizeof(pfd), &pfd); + SetPixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, &pfd); - /* PixelFormat selection */ - ZeroMemory(&pfd, sizeof(pfd)); - pfd.nSize = sizeof(pfd); - pfd.nVersion = 1; - pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cColorBits = 32; - pfd.iLayerType = PFD_MAIN_PLANE; - - iPixelFormat = ChoosePixelFormat(wined3d_fake_gl_context_hdc, &pfd); - if(!iPixelFormat) { - /* If this happens something is very wrong as ChoosePixelFormat barely fails */ - ERR("Can't find a suitable iPixelFormat\n"); - goto fail; - } - DescribePixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, sizeof(pfd), &pfd); - SetPixelFormat(wined3d_fake_gl_context_hdc, iPixelFormat, &pfd); - - /* Create a GL context */ - glCtx = pwglCreateContext(wined3d_fake_gl_context_hdc); - if (!glCtx) { - WARN_(d3d_caps)("Error creating default context for capabilities initialization\n"); - goto fail; - } + /* Create a GL context. */ + glCtx = pwglCreateContext(wined3d_fake_gl_context_hdc); + if (!glCtx) + { + WARN_(d3d_caps)("Error creating default context for capabilities initialization.\n"); + goto fail; + } - /* Make it the current GL context */ - if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) { - ERR_(d3d_caps)("Failed to make fake GL context current.\n"); - goto fail; - } + /* Make it the current GL context. */ + if (!pwglMakeCurrent(wined3d_fake_gl_context_hdc, glCtx)) + { + ERR_(d3d_caps)("Failed to make fake GL context current.\n"); + goto fail; } context_set_last_device(NULL);

1 0

Henri Verbeet : wined3d: Get rid of the silly refcount for the "fake" GL context.
by Alexandre Julliard 02 Jul '09

02 Jul '09

Module: wine Branch: master Commit: db6ea72201bed5f51ede902e08e37fdc3742ab22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6ea72201bed5f51ede902e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 2 10:01:38 2009 +0200 wined3d: Get rid of the silly refcount for the "fake" GL context. --- dlls/wined3d/directx.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 13651e6..87f6e89 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -197,7 +197,6 @@ glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT]; * function query some info from GL. */ -static int wined3d_fake_gl_context_ref = 0; static BOOL wined3d_fake_gl_context_available = FALSE; static HDC wined3d_fake_gl_context_hdc = NULL; static HWND wined3d_fake_gl_context_hwnd = NULL; @@ -224,26 +223,22 @@ static void WineD3D_ReleaseFakeGLContext(void) { } glCtx = pwglGetCurrentContext(); - - TRACE_(d3d_caps)("decrementing ref from %i\n", wined3d_fake_gl_context_ref); - if (0 == (--wined3d_fake_gl_context_ref) ) { - if (glCtx) + if (glCtx) + { + TRACE_(d3d_caps)("destroying fake GL context\n"); + if (!pwglMakeCurrent(NULL, NULL)) { - TRACE_(d3d_caps)("destroying fake GL context\n"); - if (!pwglMakeCurrent(NULL, NULL)) - { - ERR("Failed to disable fake GL context.\n"); - } - pwglDeleteContext(glCtx); + ERR("Failed to disable fake GL context.\n"); } - if(wined3d_fake_gl_context_hdc) - ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); - wined3d_fake_gl_context_hdc = NULL; /* Make sure we don't think that it is still around */ - if(wined3d_fake_gl_context_hwnd) - DestroyWindow(wined3d_fake_gl_context_hwnd); - wined3d_fake_gl_context_hwnd = NULL; - wined3d_fake_gl_context_available = FALSE; + pwglDeleteContext(glCtx); } + if (wined3d_fake_gl_context_hdc) + ReleaseDC(wined3d_fake_gl_context_hwnd, wined3d_fake_gl_context_hdc); + wined3d_fake_gl_context_hdc = NULL; /* Make sure we don't think that it is still around */ + if (wined3d_fake_gl_context_hwnd) + DestroyWindow(wined3d_fake_gl_context_hwnd); + wined3d_fake_gl_context_hwnd = NULL; + wined3d_fake_gl_context_available = FALSE; LeaveCriticalSection(&wined3d_fake_gl_context_cs); } @@ -256,7 +251,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) { EnterCriticalSection(&wined3d_fake_gl_context_cs); TRACE("getting context...\n"); - if(wined3d_fake_gl_context_ref > 0) goto ret; /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", @@ -309,9 +303,6 @@ static BOOL WineD3D_CreateFakeGLContext(void) { } context_set_last_device(NULL); - ret: - TRACE("incrementing ref from %i\n", wined3d_fake_gl_context_ref); - wined3d_fake_gl_context_ref++; wined3d_fake_gl_context_available = TRUE; LeaveCriticalSection(&wined3d_fake_gl_context_cs); return TRUE;

1 0