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

Rein Klazes : comdlg32: Fix problems in calculation of the size of a file dialog.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 229d9a6e032d6ed34f80fc4a857f65244e64aa23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=229d9a6e032d6ed34f80fc4a8… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Aug 6 07:32:08 2009 +0200 comdlg32: Fix problems in calculation of the size of a file dialog. --- dlls/comdlg32/filedlg.c | 64 +++++--------- dlls/comdlg32/tests/filedlg.c | 198 +++++++++++++++++++++++++++++++++++++++++ dlls/comdlg32/tests/rsrc.rc | 9 ++ 3 files changed, 230 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=229d9a6e032d6ed34f80f…

1 0

Hans Leidekker : advapi32: Factor out lookup of local usernames and well-known SIDs.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: e5e40ef423ceadce5f37995b35579c464facd00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e40ef423ceadce5f37995b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 6 11:12:51 2009 +0200 advapi32: Factor out lookup of local usernames and well-known SIDs. Based on a patch by Aric Stewart. --- dlls/advapi32/advapi32_misc.h | 3 + dlls/advapi32/security.c | 205 ++++++++++++++++++++++++++++------------- 2 files changed, 144 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5e40ef423ceadce5f379…

1 0

Stefan Dösinger : ddraw: d3d7 does not support two sided stencil.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: c0892c2f35d3f67c4d1f8b1decbf5444d7354655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0892c2f35d3f67c4d1f8b1de… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 5 15:58:19 2009 +0200 ddraw: d3d7 does not support two sided stencil. The header is wrong. There is simply no API to set this. The MS header does not have this declaration either. --- dlls/ddraw/direct3d.c | 2 +- include/d3dcaps.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 9ce0d36..88d5f2f 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -1324,7 +1324,7 @@ IDirect3DImpl_GetCaps(IWineD3D *WineD3D, Desc7->dwStencilCaps &= ( D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT | - D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_TWOSIDED); + D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR); /* FVF caps ?*/ diff --git a/include/d3dcaps.h b/include/d3dcaps.h index f96ca5d..b44c49d 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -311,7 +311,6 @@ typedef struct _D3DDeviceDesc7 { #define D3DSTENCILCAPS_INVERT 0x00000020 #define D3DSTENCILCAPS_INCR 0x00000040 #define D3DSTENCILCAPS_DECR 0x00000080 -#define D3DSTENCILCAPS_TWOSIDED 0x00000100 #define D3DTEXOPCAPS_DISABLE 0x00000001 #define D3DTEXOPCAPS_SELECTARG1 0x00000002

1 0

Stefan Dösinger : wined3d: Not all cards support float16 filtering.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: c6d3e754821b9b1d21c09e2df915d4415fe028fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d3e754821b9b1d21c09e2df… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 5 22:12:10 2009 +0200 wined3d: Not all cards support float16 filtering. --- dlls/wined3d/utils.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 176 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 71587c1..07a0794 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -273,23 +273,23 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { /* Float */ {WINED3DFMT_R16_FLOAT, GL_RGB16F_ARB, GL_RGB16F_ARB, 0, GL_RED, GL_HALF_FLOAT_ARB, - WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_FLOAT}, {WINED3DFMT_R16_FLOAT, GL_R16F, GL_R16F, 0, GL_RED, GL_HALF_FLOAT_ARB, - WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG}, {WINED3DFMT_R16G16_FLOAT, GL_RGB16F_ARB, GL_RGB16F_ARB, 0, GL_RGB, GL_HALF_FLOAT_ARB, - WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_FLOAT}, {WINED3DFMT_R16G16_FLOAT, GL_RG16F, GL_RG16F, 0, GL_RG, GL_HALF_FLOAT_ARB, - WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_RG}, {WINED3DFMT_R16G16B16A16_FLOAT, GL_RGBA16F_ARB, GL_RGBA16F_ARB, 0, GL_RGBA, GL_HALF_FLOAT_ARB, - WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_RENDERTARGET, ARB_TEXTURE_FLOAT}, /* Palettized formats */ {WINED3DFMT_P8, GL_RGBA, GL_RGBA, 0, @@ -770,6 +770,176 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) return TRUE; } +static BOOL color_match(DWORD c1, DWORD c2, BYTE max_diff) +{ + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + c1 >>= 8; c2 >>= 8; + if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + return TRUE; +} + +/* A context is provided by the caller */ +static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal) +{ + GLuint tex, fbo, buffer; + const DWORD data[] = {0x00000000, 0xffffffff}; + DWORD readback[16 * 1]; + BOOL ret = FALSE; + + /* Render a filtered texture and see what happens. This is intended to detect the lack of + * float16 filtering on ATI X1000 class cards. The drivers disable filtering instead of + * falling back to software. If this changes in the future this code will get fooled and + * apps might hit the software path due to incorrectly advertised caps. + * + * Its unlikely that this changes however. GL Games like Mass Effect depend on the filter + * disable fallback, if Apple or ATI ever change the driver behavior they will break more + * than Wine. The Linux binary <= r500 driver is not maintained any more anyway + */ + + ENTER_GL(); + while(glGetError()); + + glGenTextures(1, &buffer); + glBindTexture(GL_TEXTURE_2D, buffer); + memset(readback, 0x7e, sizeof(readback)); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 16, 1, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, readback); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); + + glGenTextures(1, &tex); + glBindTexture(GL_TEXTURE_2D, tex); + glTexImage2D(GL_TEXTURE_2D, 0, internal, 2, 1, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, data); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); + glEnable(GL_TEXTURE_2D); + + GL_EXTCALL(glGenFramebuffersEXT(1, &fbo)); + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo)); + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, buffer, 0)); + glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); + + glViewport(0, 0, 16, 1); + glDisable(GL_LIGHTING); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + + glClearColor(0, 1, 0, 0); + glClear(GL_COLOR_BUFFER_BIT); + + glBegin(GL_TRIANGLE_STRIP); + glTexCoord2f(0.0, 0.0); + glVertex2f(-1.0f, -1.0f); + glTexCoord2f(1.0, 0.0); + glVertex2f(1.0f, -1.0f); + glTexCoord2f(0.0, 1.0); + glVertex2f(-1.0f, 1.0f); + glTexCoord2f(1.0, 1.0); + glVertex2f(1.0f, 1.0f); + glEnd(); + + glBindTexture(GL_TEXTURE_2D, buffer); + memset(readback, 0x7f, sizeof(readback)); + glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); + if(color_match(readback[6], 0xffffffff, 5) || color_match(readback[6], 0x00000000, 5) || + color_match(readback[9], 0xffffffff, 5) || color_match(readback[9], 0x00000000, 5)) + { + TRACE("Read back colors 0x%08x and 0x%08x close to unfiltered color, asuming no filtering\n", + readback[6], readback[9]); + ret = FALSE; + } + else + { + TRACE("Read back colors are 0x%08x and 0x%08x, assuming texture is filtered\n", + readback[6], readback[9]); + ret = TRUE; + } + + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + GL_EXTCALL(glDeleteFramebuffersEXT(1, &fbo)); + glDeleteTextures(1, &tex); + glDeleteTextures(1, &buffer); + + if(glGetError()) + { + FIXME("Error during filtering test for format %x, returning no filtering\n", internal); + ret = FALSE; + } + LEAVE_GL(); + return ret; +} + +static void init_format_filter_info(struct wined3d_gl_info *gl_info) +{ + unsigned int fmt_idx, i; + WINED3DFORMAT fmts16[] = { + WINED3DFMT_R16_FLOAT, + WINED3DFMT_R16G16_FLOAT, + WINED3DFMT_R16G16B16A16_FLOAT, + }; + BOOL filtered; + struct GlPixelFormatDesc *desc; + + if(wined3d_settings.offscreen_rendering_mode != ORM_FBO) + { + WARN("No FBO support, or no FBO ORM, guessing filter info from GL caps\n"); + if(gl_info->gl_vendor == VENDOR_NVIDIA && GL_SUPPORT(ARB_TEXTURE_FLOAT)) + { + TRACE("Nvidia card with texture_float support: Assuming float16 blending\n"); + filtered = TRUE; + } + else if(GL_LIMITS(glsl_varyings > 44)) + { + TRACE("More than 44 GLSL varyings - assuming d3d10 card with float16 blending\n"); + filtered = TRUE; + } + else + { + TRACE("Assuming no float16 blending\n"); + filtered = FALSE; + } + + if(filtered) + { + for(i = 0; i < (sizeof(fmts16) / sizeof(*fmts16)); i++) + { + fmt_idx = getFmtIdx(fmts16[i]); + gl_info->gl_formats[fmt_idx].Flags |= WINED3DFMT_FLAG_FILTERING; + } + } + return; + } + + for(i = 0; i < (sizeof(fmts16) / sizeof(*fmts16)); i++) + { + fmt_idx = getFmtIdx(fmts16[i]); + desc = &gl_info->gl_formats[fmt_idx]; + if(!desc->glInternal) continue; /* Not supported by GL */ + + filtered = check_filter(gl_info, gl_info->gl_formats[fmt_idx].glInternal); + if(filtered) + { + TRACE("Format %s supports filtering\n", debug_d3dformat(fmts16[i])); + desc->Flags |= WINED3DFMT_FLAG_FILTERING; + } + else + { + TRACE("Format %s does not support filtering\n", debug_d3dformat(fmts16[i])); + } + } +} + static void apply_format_fixups(struct wined3d_gl_info *gl_info) { int idx; @@ -942,6 +1112,7 @@ BOOL initPixelFormats(struct wined3d_gl_info *gl_info) apply_format_fixups(gl_info); init_format_fbo_compat_info(gl_info); + init_format_filter_info(gl_info); return TRUE;

1 0

Henri Verbeet : winex11.drv: Add support for XShm pixmaps.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 9fd29492c1b47fb0618997e9937ca7da57975d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd29492c1b47fb0618997e99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 08:12:22 2009 +0200 winex11.drv: Add support for XShm pixmaps. Most of this is "Copyright 2004 Huw Davies for CodeWeavers", I just did a little bit of integration. --- dlls/winex11.drv/dib.c | 286 +++++++++++++++++++++++++++++---------------- dlls/winex11.drv/x11drv.h | 8 ++ 2 files changed, 193 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fd29492c1b47fb061899…

1 0

Henri Verbeet : wined3d: Call the shader_load_np2fixup_constants() handler directly from inside the shader backend.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 4c1b3de93603545bbce6a86ee1225168824179b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1b3de93603545bbce6a86ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 08:12:21 2009 +0200 wined3d: Call the shader_load_np2fixup_constants() handler directly from inside the shader backend. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c758d7b..cc039c5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4260,7 +4260,7 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { } /* 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); + if (compiled->np2fixup_info.super.active) shader_arb_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 diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b0efd6c..6ee5f47 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4281,8 +4281,9 @@ static void shader_glsl_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { /* In case that NP2 texcoord fixup data is found for the selected program, trigger a reload of the * constants. This has to be done because it can't be guaranteed that sampler() (from state.c) is * called between selecting the shader and using it, which results in wrong fixup for some frames. */ - if (priv->glsl_program && priv->glsl_program->np2Fixup_info) { - This->shader_backend->shader_load_np2fixup_constants(iface, usePS, useVS); + if (priv->glsl_program && priv->glsl_program->np2Fixup_info) + { + shader_glsl_load_np2fixup_constants(iface, usePS, useVS); } }

1 0

Henri Verbeet : wined3d: Explicitly pass the context to the shader_load_constants() handlers.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 03686cb6bdf1ead5ce8407553538485d2d1c1c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03686cb6bdf1ead5ce8407553… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 08:12:20 2009 +0200 wined3d: Explicitly pass the context to the shader_load_constants() handlers. --- dlls/wined3d/arb_program_shader.c | 27 +++++++++++---------------- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/glsl_shader.c | 14 +++++++------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +++- 5 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 180d929..c758d7b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -530,33 +530,28 @@ static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl) * worry about the Integers or Booleans */ /* GL locking is done by the caller (state handler) */ -static void shader_arb_load_constants( - IWineD3DDevice* device, - char usePixelShader, - char useVertexShader) { - - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) device; - IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; - const struct wined3d_context *context = context_get_current(); +static void shader_arb_load_constants(const struct wined3d_context *context, char usePixelShader, char useVertexShader) +{ + IWineD3DDeviceImpl *device = ((IWineD3DSurfaceImpl *)context->surface)->resource.wineD3DDevice; + IWineD3DStateBlockImpl* stateBlock = device->stateBlock; const struct wined3d_gl_info *gl_info = context->gl_info; if (useVertexShader) { IWineD3DBaseShaderImpl* vshader = (IWineD3DBaseShaderImpl*) stateBlock->vertexShader; /* Load DirectX 9 float constants for vertex shader */ - deviceImpl->highest_dirty_vs_const = shader_arb_load_constantsF(vshader, gl_info, GL_VERTEX_PROGRAM_ARB, - deviceImpl->highest_dirty_vs_const, stateBlock->vertexShaderConstantF, context->vshader_const_dirty); - - shader_arb_vs_local_constants(deviceImpl); + device->highest_dirty_vs_const = shader_arb_load_constantsF(vshader, gl_info, GL_VERTEX_PROGRAM_ARB, + device->highest_dirty_vs_const, stateBlock->vertexShaderConstantF, context->vshader_const_dirty); + shader_arb_vs_local_constants(device); } if (usePixelShader) { IWineD3DBaseShaderImpl* pshader = (IWineD3DBaseShaderImpl*) stateBlock->pixelShader; /* Load DirectX 9 float constants for pixel shader */ - deviceImpl->highest_dirty_ps_const = shader_arb_load_constantsF(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, - deviceImpl->highest_dirty_ps_const, stateBlock->pixelShaderConstantF, context->pshader_const_dirty); - shader_arb_ps_local_constants(deviceImpl); + device->highest_dirty_ps_const = shader_arb_load_constantsF(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB, + device->highest_dirty_ps_const, stateBlock->pixelShaderConstantF, context->pshader_const_dirty); + shader_arb_ps_local_constants(device); } } @@ -4257,7 +4252,7 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { context->pshader_const_dirty[i] = 1; } /* Also takes care of loading local constants */ - shader_arb_load_constants(iface, TRUE, FALSE); + shader_arb_load_constants(context, TRUE, FALSE); } else { diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 40efdd4..a8729e6 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1371,7 +1371,7 @@ static void shader_none_select_depth_blt(IWineD3DDevice *iface, enum tex_types t static void shader_none_deselect_depth_blt(IWineD3DDevice *iface) {} static void shader_none_update_float_vertex_constants(IWineD3DDevice *iface, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(IWineD3DDevice *iface, UINT start, UINT count) {} -static void shader_none_load_constants(IWineD3DDevice *iface, char usePS, char useVS) {} +static void shader_none_load_constants(const struct wined3d_context *context, char usePS, char useVS) {} static void shader_none_load_np2fixup_constants(IWineD3DDevice *iface, char usePS, char useVS) {} static void shader_none_destroy(IWineD3DBaseShader *iface) {} static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a6b98ff..b0efd6c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -627,13 +627,13 @@ static void shader_glsl_load_np2fixup_constants( * Loads the app-supplied constants into the currently set GLSL program. */ /* GL locking is done by the caller (state handler) */ -static void shader_glsl_load_constants(IWineD3DDevice *device, char usePixelShader, char useVertexShader) +static void shader_glsl_load_constants(const struct wined3d_context *context, + char usePixelShader, char useVertexShader) { - const struct wined3d_context *context = context_get_current(); - IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) device; - struct shader_glsl_priv *priv = deviceImpl->shader_priv; - IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; + IWineD3DDeviceImpl *device = ((IWineD3DSurfaceImpl *)context->surface)->resource.wineD3DDevice; const struct wined3d_gl_info *gl_info = context->gl_info; + IWineD3DStateBlockImpl* stateBlock = device->stateBlock; + struct shader_glsl_priv *priv = device->shader_priv; GLhandleARB programId; struct glsl_shader_prog_link *prog = priv->glsl_program; @@ -663,7 +663,7 @@ static void shader_glsl_load_constants(IWineD3DDevice *device, char usePixelShad stateBlock->changed.vertexShaderConstantsB & vshader->baseShader.reg_maps.boolean_constants); /* Upload the position fixup params */ - GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, &deviceImpl->posFixup[0])); + GL_EXTCALL(glUniform4fvARB(prog->posFixup_location, 1, &device->posFixup[0])); checkGLcall("glUniform4fvARB"); } @@ -718,7 +718,7 @@ static void shader_glsl_load_constants(IWineD3DDevice *device, char usePixelShad correction_params[1] = 1.0f; } else { /* position is window relative, not viewport relative */ - correction_params[0] = ((IWineD3DSurfaceImpl *) deviceImpl->render_targets[0])->currentDesc.Height; + correction_params[0] = ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Height; correction_params[1] = -1.0f; } GL_EXTCALL(glUniform4fvARB(prog->ycorrection_location, 1, correction_params)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c61f897..29708e3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3361,7 +3361,7 @@ static void shaderconstant(DWORD state, IWineD3DStateBlockImpl *stateblock, stru return; } - device->shader_backend->shader_load_constants((IWineD3DDevice *)device, use_ps(stateblock), use_vs(stateblock)); + device->shader_backend->shader_load_constants(context, use_ps(stateblock), use_vs(stateblock)); } static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 414b519..9959a62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -817,6 +817,8 @@ struct vs_compile_args { WORD swizzle_map; /* MAX_ATTRIBS, 16 */ }; +struct wined3d_context; + typedef struct { void (*shader_handle_instruction)(const struct wined3d_shader_instruction *); void (*shader_select)(IWineD3DDevice *iface, BOOL usePS, BOOL useVS); @@ -824,7 +826,7 @@ typedef struct { void (*shader_deselect_depth_blt)(IWineD3DDevice *iface); void (*shader_update_float_vertex_constants)(IWineD3DDevice *iface, UINT start, UINT count); void (*shader_update_float_pixel_constants)(IWineD3DDevice *iface, UINT start, UINT count); - void (*shader_load_constants)(IWineD3DDevice *iface, char usePS, char useVS); + void (*shader_load_constants)(const struct wined3d_context *context, char usePS, char useVS); void (*shader_load_np2fixup_constants)(IWineD3DDevice *iface, char usePS, char useVS); void (*shader_destroy)(IWineD3DBaseShader *iface); HRESULT (*shader_alloc_private)(IWineD3DDevice *iface);

1 0

Henri Verbeet : wined3d: Track render_offscreen in the context.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: a7251f0f4eb35f401f5eabfe1d6a393eb87eb1d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7251f0f4eb35f401f5eabfe1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 08:12:19 2009 +0200 wined3d: Track render_offscreen in the context. This makes sure the relevant states in FindContext() are actually marked dirty when needed. --- dlls/wined3d/arb_program_shader.c | 8 +++++--- dlls/wined3d/context.c | 22 ++++++++++++---------- dlls/wined3d/device.c | 10 ++++++---- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 19 ++++++++++--------- dlls/wined3d/state.c | 27 ++++++++++++++++----------- dlls/wined3d/surface.c | 9 ++++++--- dlls/wined3d/wined3d_private.h | 5 ++--- 8 files changed, 58 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7251f0f4eb35f401f5ea…

1 0

Andrew Nguyen : wine.inf: Add a fake DLL for dinput8.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 625d1e75cd0435d3cb34f9439c37bbd17aedbf5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=625d1e75cd0435d3cb34f9439… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Aug 6 03:18:06 2009 -0500 wine.inf: Add a fake DLL for dinput8. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 038e631..6aff0b4 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2466,6 +2466,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,ddeml.dll 11,,ddhelp.exe 11,,ddraw.dll +11,,dinput8.dll 11,,dosx.exe 11,,dsound.dll 11,,dsound.vxd

1 0

Henri Verbeet : wined3d: Set the WINED3DTEXF_NONE entry in the minification lookup table to GL_NEAREST .
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: b04e992a6551823e590a1f896a898962d920aac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b04e992a6551823e590a1f896… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 6 08:12:18 2009 +0200 wined3d: Set the WINED3DTEXF_NONE entry in the minification lookup table to GL_NEAREST. Although WINED3DTEXF_NONE is not a valid minification filter, having it in the tables simplifies the lookup. GL_NEAREST is more appropriate than GL_LINEAR though. --- 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 7be5f44..de37df1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -171,7 +171,7 @@ DWORD *stateLookup[MAX_LOOKUPS]; const struct min_lookup minMipLookup[] = { /* NONE POINT LINEAR */ - {{GL_LINEAR, GL_LINEAR, GL_LINEAR}}, /* NONE */ + {{GL_NEAREST, GL_NEAREST, GL_NEAREST}}, /* NONE */ {{GL_NEAREST, GL_NEAREST_MIPMAP_NEAREST, GL_NEAREST_MIPMAP_LINEAR}}, /* POINT*/ {{GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR_MIPMAP_LINEAR}}, /* LINEAR */ };

1 0