wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Austin English : dwmapi: Add a stub for DwmGetGraphicsStreamClient.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: ce4d4909a108aeb9bc98e29350757bade89d755c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4d4909a108aeb9bc98e2935… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Sep 30 13:11:20 2009 -0500 dwmapi: Add a stub for DwmGetGraphicsStreamClient. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 7b7ad8e..27e0704 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -29,7 +29,7 @@ @ stdcall DwmFlush() @ stdcall DwmGetColorizationColor(ptr long) @ stub DwmGetCompositionTimingInfo -@ stub DwmGetGraphicsStreamClient +@ stdcall DwmGetGraphicsStreamClient(long ptr) @ stub DwmGetGraphicsStreamTransformHint @ stdcall DwmGetTransportAttributes(ptr ptr ptr) @ stub DwmGetWindowAttribute diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 2bbb501..40ecec7 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -110,10 +110,19 @@ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attr return E_NOTIMPL; } +/********************************************************************** + * DwmGetGraphicsStreamClient (DWMAPI.@) + */ +HRESULT WINAPI DwmGetGraphicsStreamClient(UINT uIndex, UUID *pClientUuid) +{ + FIXME("(%d, %p) stub\n", uIndex, pClientUuid); + + return E_NOTIMPL; +} /********************************************************************** - * * DwmGetTransportAttributes (DWMAPI.@) - * */ + * DwmGetTransportAttributes (DWMAPI.@) + */ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected, DWORD *pDwGeneration) { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration);

1 0

Roderick Colenbrander : winex11: Add support for 16-bit/32-bit DIB sections .
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 6b8753185f30197047773af6a26eafd34d45367c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8753185f30197047773af6a… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 26 14:52:46 2009 +0200 winex11: Add support for 16-bit/32-bit DIB sections. --- dlls/winex11.drv/dib.c | 39 ++++++++++++++++++++++++++++----------- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xrender.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 4b15569..1fc8812 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4744,19 +4744,23 @@ HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, &physBitmap->nColorMap ); } - /* create pixmap and X image */ - wine_tsx11_lock(); - if(dib.dsBm.bmBitsPixel == 1) - { - physBitmap->pixmap_depth = 1; - physBitmap->trueColor = FALSE; - } - else + if (!X11DRV_XRender_SetPhysBitmapDepth( physBitmap, &dib )) { - physBitmap->pixmap_depth = screen_depth; - physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; - physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); + if (dib.dsBm.bmBitsPixel == 1) + { + physBitmap->pixmap_depth = 1; + physBitmap->trueColor = FALSE; + } + else + { + physBitmap->pixmap_depth = screen_depth; + physBitmap->pixmap_color_shifts = X11DRV_PALETTE_default_shifts; + physBitmap->trueColor = (visual->class == TrueColor || visual->class == DirectColor); + } } + + /* create pixmap and X image */ + wine_tsx11_lock(); #ifdef HAVE_LIBXXSHM physBitmap->shminfo.shmid = -1; @@ -4803,6 +4807,19 @@ HBITMAP CDECL X11DRV_CreateDIBSection( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, wine_tsx11_unlock(); if (!physBitmap->pixmap || !physBitmap->image) return 0; + if (physBitmap->trueColor) + { + ColorShifts *shifts = &physBitmap->pixmap_color_shifts; + + /* When XRender is around and used, we also support dibsections in other formats like 16-bit. In these + * cases we need to override the mask of XImages. The reason is that during XImage creation the masks are + * derived from a 24-bit visual (no 16-bit ones are around when X runs at 24-bit). SetImageBits and other + * functions rely on the color masks for proper color conversion, so we need to override the masks here. */ + physBitmap->image->red_mask = shifts->physicalRed.max << shifts->physicalRed.shift; + physBitmap->image->green_mask = shifts->physicalGreen.max << shifts->physicalGreen.shift; + physBitmap->image->blue_mask = shifts->physicalBlue.max << shifts->physicalBlue.shift; + } + /* install fault handler */ InitializeCriticalSection( &physBitmap->lock ); physBitmap->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": X_PHYSBITMAP.lock"); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8f0764d..922855d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -286,6 +286,7 @@ extern void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *phys extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx); +extern BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib); BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 9280ce3..076b6d4 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2,6 +2,7 @@ * Functions to use the XRender extension * * Copyright 2001, 2002 Huw D M Davies for CodeWeavers + * Copyright 2009 Roderick Colenbrander * * Some parts also: * Copyright 2000 Keith Packard, member of The XFree86 Project, Inc. @@ -835,6 +836,33 @@ void X11DRV_XRender_DeleteDC(X11DRV_PDEVICE *physDev) return; } +BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) +{ + WineXRenderFormat *fmt; + ColorShifts shifts; + + /* When XRender is not around we can only use the screen_depth and when needed we perform depth conversion + * in software. Further we also return the screen depth for paletted formats or TrueColor formats with a low + * number of bits because XRender can't handle paletted formats and 8-bit TrueColor does not exist for XRender. */ + if(!X11DRV_XRender_Installed || dib->dsBm.bmBitsPixel <= 8) + return FALSE; + + X11DRV_PALETTE_ComputeColorShifts(&shifts, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + + /* Common formats should be in our picture format table. */ + fmt = get_xrender_format_from_color_shifts(dib->dsBm.bmBitsPixel, &shifts); + if(fmt) + { + physBitmap->pixmap_depth = fmt->pict_format->depth; + physBitmap->trueColor = TRUE; + physBitmap->pixmap_color_shifts = shifts; + return TRUE; + } + TRACE("Unhandled dibsection format bpp=%d, redMask=%x, greenMask=%x, blueMask=%x\n", + dib->dsBm.bmBitsPixel, dib->dsBitfields[0], dib->dsBitfields[1], dib->dsBitfields[2]); + return FALSE; +} + /*********************************************************************** * X11DRV_XRender_UpdateDrawable * @@ -2172,6 +2200,11 @@ void X11DRV_XRender_CopyBrush(X11DRV_PDEVICE *physDev, X_PHYSBITMAP *physBitmap, wine_tsx11_unlock(); } +BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, const DIBSECTION *dib) +{ + return FALSE; +} + BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, INT widthSrc, INT heightSrc,

1 0

Stefan Dösinger : wined3d: Fix a contradicting comment .
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 0c70291c2c818cf15e0b8f60fc9178faebf64702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c70291c2c818cf15e0b8f60f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 10 23:23:37 2009 +0200 wined3d: Fix a contradicting comment. The test was adopted from the ddraw test, where GetPrivateData does not addref. The test code was adjusted, the comment apparently not. --- dlls/d3d9/tests/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 638442e..69c85f0 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -365,7 +365,7 @@ static void test_private_data(IDirect3DDevice9 *device) hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DSurface9, &ptr, &size); ok(hr == D3D_OK, "IDirect3DSurface9_GetPrivateData failed with %08x\n", hr); ref2 = getref((IUnknown *) device); - /* Object is NOT being addrefed */ + /* Object is addrefed */ ok(ptr == (IUnknown *) device, "Returned interface pointer is %p, expected %p\n", ptr, device); ok(ref2 == ref + 2, "Object reference is %d, expected %d. ptr at %p, orig at %p\n", ref2, ref + 2, ptr, device); IUnknown_Release(ptr);

1 0

Stefan Dösinger : wined3d: Fix an error string.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: c749debec61345f5abbbcd67076a41d7b722db6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c749debec61345f5abbbcd670… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 29 17:43:44 2009 +0200 wined3d: Fix an error string. --- 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 8eac47c..5d494ec 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -693,7 +693,7 @@ static BOOL match_broken_nv_clip(const struct wined3d_gl_info *gl_info, const ch GL_EXTCALL(glGenProgramsARB(1, &prog)); if(!prog) { - ERR("Failed to create an ARB offset limit test program\n"); + ERR("Failed to create the NVvp clip test program\n"); LEAVE_GL(); return FALSE; }

1 0

Hans Leidekker : msi: Schedule a rename operation when the file to overwrite is in use.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 9c8b83ce015d91c44917c4aa4856d7a117ed170b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8b83ce015d91c44917c4aa4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 1 11:53:20 2009 +0200 msi: Schedule a rename operation when the file to overwrite is in use. --- dlls/msi/action.c | 3 + dlls/msi/files.c | 39 ++++++++++- dlls/msi/media.c | 47 ++++++++++++-- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 163 ++++++++++++++++++++++++++++++++++++---------- 5 files changed, 209 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c8b83ce015d91c44917c…

1 0

Henri Verbeet : wined3d: Use stateblock_init_contained_states() for WINED3DSBT_PIXELSTATE stateblocks.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 93c949eba51b74a91dbaf11df81bbc2affcd4afa URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c949eba51b74a91dbaf11df… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:10 2009 +0200 wined3d: Use stateblock_init_contained_states() for WINED3DSBT_PIXELSTATE stateblocks. --- dlls/wined3d/stateblock.c | 46 +-------------------------------------------- 1 files changed, 1 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c1a7184..9cbc1b2 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1499,51 +1499,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); - - /* Pixel Shader Constants. */ - for (i = 0; i < gl_info->max_pshader_constantsF; ++i) - { - stateblock->contained_ps_consts_f[i] = i; - } - stateblock->num_contained_ps_consts_f = gl_info->max_pshader_constantsF; - - for (i = 0; i < MAX_CONST_B; ++i) - { - stateblock->contained_ps_consts_b[i] = i; - } - stateblock->num_contained_ps_consts_b = MAX_CONST_B; - - for (i = 0; i < MAX_CONST_I; ++i) - { - stateblock->contained_ps_consts_i[i] = i; - } - stateblock->num_contained_ps_consts_i = MAX_CONST_I; - - for (i = 0; i < NUM_SAVEDPIXELSTATES_R; i++) - { - stateblock->contained_render_states[i] = SavedPixelStates_R[i]; - } - stateblock->num_contained_render_states = NUM_SAVEDPIXELSTATES_R; - - for (i = 0; i < MAX_TEXTURES; ++i) - { - for (j = 0; j < NUM_SAVEDPIXELSTATES_T; ++j) - { - stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; - stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = SavedPixelStates_T[j]; - ++stateblock->num_contained_tss_states; - } - } - - for (i = 0 ; i < MAX_COMBINED_SAMPLERS; ++i) - { - for (j = 0; j < NUM_SAVEDPIXELSTATES_S; ++j) - { - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = SavedPixelStates_S[j]; - stateblock->num_contained_sampler_states++; - } - } + stateblock_init_contained_states(stateblock); if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader);

1 0

Henri Verbeet : wined3d: Add a separate function to initialize the saved states for WINED3DSBT_PIXELSTATE .
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 5a01619d3171008092eb4158a3298a71345d8ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a01619d3171008092eb4158a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:09 2009 +0200 wined3d: Add a separate function to initialize the saved states for WINED3DSBT_PIXELSTATE. --- dlls/wined3d/stateblock.c | 46 ++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0df179a..c1a7184 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -79,7 +79,7 @@ static inline void stateblock_set_bits(DWORD *map, UINT map_size) } /* Set all members of a stateblock savedstate to the given value */ -static void stateblock_savedstates_set(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) +static void stateblock_savedstates_set_all(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) { unsigned int i; @@ -112,6 +112,30 @@ static void stateblock_savedstates_set(SAVEDSTATES *states, const struct wined3d memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_vshader_constantsF); } +static void stateblock_savedstates_set_pixel(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) +{ + DWORD texture_mask = 0; + WORD sampler_mask = 0; + unsigned int i; + + states->pixelShader = 1; + + for (i = 0; i < NUM_SAVEDPIXELSTATES_R; ++i) + { + DWORD rs = SavedPixelStates_R[i]; + states->renderState[rs >> 5] |= 1 << (rs & 0x1f); + } + + for (i = 0; i < NUM_SAVEDPIXELSTATES_T; ++i) texture_mask |= 1 << SavedPixelStates_T[i]; + for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = texture_mask; + for (i = 0; i < NUM_SAVEDPIXELSTATES_S; ++i) sampler_mask |= 1 << SavedPixelStates_S[i]; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = sampler_mask; + states->pixelShaderConstantsB = 0xffff; + states->pixelShaderConstantsI = 0xffff; + + memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_pshader_constantsF); +} + static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, const struct wined3d_gl_info *gl_info) { @@ -1446,7 +1470,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { TRACE("ALL => Pretend everything has changed.\n"); - stateblock_savedstates_set(&stateblock->changed, gl_info); + stateblock_savedstates_set_all(&stateblock->changed, gl_info); stateblock_init_contained_states(stateblock); /* Lights are not part of the changed / set structure. */ @@ -1474,33 +1498,30 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); + stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); + /* Pixel Shader Constants. */ for (i = 0; i < gl_info->max_pshader_constantsF; ++i) { stateblock->contained_ps_consts_f[i] = i; - stateblock->changed.pixelShaderConstantsF[i] = TRUE; } stateblock->num_contained_ps_consts_f = gl_info->max_pshader_constantsF; for (i = 0; i < MAX_CONST_B; ++i) { stateblock->contained_ps_consts_b[i] = i; - stateblock->changed.pixelShaderConstantsB |= (1 << i); } stateblock->num_contained_ps_consts_b = MAX_CONST_B; for (i = 0; i < MAX_CONST_I; ++i) { stateblock->contained_ps_consts_i[i] = i; - stateblock->changed.pixelShaderConstantsI |= (1 << i); } stateblock->num_contained_ps_consts_i = MAX_CONST_I; for (i = 0; i < NUM_SAVEDPIXELSTATES_R; i++) { - DWORD rs = SavedPixelStates_R[i]; - stateblock->changed.renderState[rs >> 5] |= 1 << (rs & 0x1f); - stateblock->contained_render_states[i] = rs; + stateblock->contained_render_states[i] = SavedPixelStates_R[i]; } stateblock->num_contained_render_states = NUM_SAVEDPIXELSTATES_R; @@ -1508,10 +1529,8 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { for (j = 0; j < NUM_SAVEDPIXELSTATES_T; ++j) { - DWORD state = SavedPixelStates_T[j]; - stateblock->changed.textureState[i] |= 1 << state; stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; - stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = state; + stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = SavedPixelStates_T[j]; ++stateblock->num_contained_tss_states; } } @@ -1520,15 +1539,12 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * { for (j = 0; j < NUM_SAVEDPIXELSTATES_S; ++j) { - DWORD state = SavedPixelStates_S[j]; - stateblock->changed.samplerState[i] |= 1 << state; stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = state; + stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = SavedPixelStates_S[j]; stateblock->num_contained_sampler_states++; } } - stateblock->changed.pixelShader = TRUE; if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader); /* Pixel state blocks do not contain vertex buffers. Set them to NULL

1 0

Henri Verbeet : wined3d: Use stateblock_init_contained_states() for WINED3DSBT_ALL stateblocks.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 841afe485e3655f1fec64fde3c1101f65e53caa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=841afe485e3655f1fec64fde3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:08 2009 +0200 wined3d: Use stateblock_init_contained_states() for WINED3DSBT_ALL stateblocks. --- dlls/wined3d/stateblock.c | 70 +-------------------------------------------- 1 files changed, 1 insertions(+), 69 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f37e452..0df179a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1447,6 +1447,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * TRACE("ALL => Pretend everything has changed.\n"); stateblock_savedstates_set(&stateblock->changed, gl_info); + stateblock_init_contained_states(stateblock); /* Lights are not part of the changed / set structure. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -1460,75 +1461,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * } } - for (i = 1; i <= WINEHIGHEST_RENDER_STATE; ++i) - { - stateblock->contained_render_states[i - 1] = i; - } - stateblock->num_contained_render_states = WINEHIGHEST_RENDER_STATE; - - /* TODO: Filter unused transforms between TEXTURE8 and WORLD0? */ - for (i = 1; i <= HIGHEST_TRANSFORMSTATE; ++i) - { - stateblock->contained_transform_states[i - 1] = i; - } - stateblock->num_contained_transform_states = HIGHEST_TRANSFORMSTATE; - - for (i = 0; i < gl_info->max_vshader_constantsF; ++i) - { - stateblock->contained_vs_consts_f[i] = i; - } - stateblock->num_contained_vs_consts_f = gl_info->max_vshader_constantsF; - - for (i = 0; i < MAX_CONST_I; ++i) - { - stateblock->contained_vs_consts_i[i] = i; - } - stateblock->num_contained_vs_consts_i = MAX_CONST_I; - - for (i = 0; i < MAX_CONST_B; ++i) - { - stateblock->contained_vs_consts_b[i] = i; - } - stateblock->num_contained_vs_consts_b = MAX_CONST_B; - - for (i = 0; i < gl_info->max_pshader_constantsF; ++i) - { - stateblock->contained_ps_consts_f[i] = i; - } - stateblock->num_contained_ps_consts_f = gl_info->max_pshader_constantsF; - - for (i = 0; i < MAX_CONST_I; ++i) - { - stateblock->contained_ps_consts_i[i] = i; - } - stateblock->num_contained_ps_consts_i = MAX_CONST_I; - - for (i = 0; i < MAX_CONST_B; ++i) - { - stateblock->contained_ps_consts_b[i] = i; - } - stateblock->num_contained_ps_consts_b = MAX_CONST_B; - - for (i = 0; i < MAX_TEXTURES; ++i) - { - for (j = 0; j <= WINED3D_HIGHEST_TEXTURE_STATE; ++j) - { - stateblock->contained_tss_states[stateblock->num_contained_tss_states].stage = i; - stateblock->contained_tss_states[stateblock->num_contained_tss_states].state = j; - ++stateblock->num_contained_tss_states; - } - } - - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - for (j = 1; j <= WINED3D_HIGHEST_SAMPLER_STATE; ++j) - { - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].stage = i; - stateblock->contained_sampler_states[stateblock->num_contained_sampler_states].state = j; - ++stateblock->num_contained_sampler_states; - } - } - for (i = 0; i < MAX_STREAMS; ++i) { if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]);

1 0

Henri Verbeet : wined3d: Simplify stateblock_savedstates_set().
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: c5029f83ecb635a2c342e8b8ab43b7084eb9bf55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5029f83ecb635a2c342e8b8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:07 2009 +0200 wined3d: Simplify stateblock_savedstates_set(). We only need to handle the case where "value" is TRUE, since the stateblock data will be filled with zeroes by default. --- dlls/wined3d/stateblock.c | 72 +++++++++++++++++---------------------------- 1 files changed, 27 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3c6863e..f37e452 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -79,54 +79,37 @@ static inline void stateblock_set_bits(DWORD *map, UINT map_size) } /* Set all members of a stateblock savedstate to the given value */ -static void stateblock_savedstates_set(SAVEDSTATES *states, BOOL value, const struct wined3d_gl_info *gl_info) +static void stateblock_savedstates_set(SAVEDSTATES *states, const struct wined3d_gl_info *gl_info) { + unsigned int i; + /* Single values */ - states->primitive_type = value; - states->indices = value; - states->material = value; - states->viewport = value; - states->vertexDecl = value; - states->pixelShader = value; - states->vertexShader = value; - states->scissorRect = value; + states->primitive_type = 1; + states->indices = 1; + states->material = 1; + states->viewport = 1; + states->vertexDecl = 1; + states->pixelShader = 1; + states->vertexShader = 1; + states->scissorRect = 1; /* Fixed size arrays */ - if (value) - { - int i; - states->streamSource = 0xffff; - states->streamFreq = 0xffff; - states->textures = 0xfffff; - stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); - stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); - for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff; - states->clipplane = 0xffffffff; - states->pixelShaderConstantsB = 0xffff; - states->pixelShaderConstantsI = 0xffff; - states->vertexShaderConstantsB = 0xffff; - states->vertexShaderConstantsI = 0xffff; - } - else - { - states->streamSource = 0; - states->streamFreq = 0; - states->textures = 0; - memset(states->transform, 0, sizeof(states->transform)); - memset(states->renderState, 0, sizeof(states->renderState)); - memset(states->textureState, 0, sizeof(states->textureState)); - memset(states->samplerState, 0, sizeof(states->samplerState)); - states->clipplane = 0; - states->pixelShaderConstantsB = 0; - states->pixelShaderConstantsI = 0; - states->vertexShaderConstantsB = 0; - states->vertexShaderConstantsI = 0; - } + states->streamSource = 0xffff; + states->streamFreq = 0xffff; + states->textures = 0xfffff; + stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); + stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); + for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3fff; + states->clipplane = 0xffffffff; + states->pixelShaderConstantsB = 0xffff; + states->pixelShaderConstantsI = 0xffff; + states->vertexShaderConstantsB = 0xffff; + states->vertexShaderConstantsI = 0xffff; /* Dynamically sized arrays */ - memset(states->pixelShaderConstantsF, value, sizeof(BOOL) * gl_info->max_pshader_constantsF); - memset(states->vertexShaderConstantsF, value, sizeof(BOOL) * gl_info->max_vshader_constantsF); + memset(states->pixelShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_pshader_constantsF); + memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_vshader_constantsF); } static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, @@ -1462,7 +1445,8 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (type == WINED3DSBT_ALL) { TRACE("ALL => Pretend everything has changed.\n"); - stateblock_savedstates_set(&stateblock->changed, TRUE, gl_info); + + stateblock_savedstates_set(&stateblock->changed, gl_info); /* Lights are not part of the changed / set structure. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) @@ -1557,7 +1541,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * else if (type == WINED3DSBT_PIXELSTATE) { TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); - stateblock_savedstates_set(&stateblock->changed, FALSE, gl_info); /* Pixel Shader Constants. */ for (i = 0; i < gl_info->max_pshader_constantsF; ++i) @@ -1629,7 +1612,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * else if (type == WINED3DSBT_VERTEXSTATE) { TRACE("VERTEXSTATE => Pretend all vertex shates have changed.\n"); - stateblock_savedstates_set(&stateblock->changed, FALSE, gl_info); /* Vertex Shader Constants. */ for (i = 0; i < gl_info->max_vshader_constantsF; ++i)

1 0

Henri Verbeet : wined3d: Get rid of stateblock_savedstates_copy().
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 75fe879c768a775d7d64b49e42a0166fcf1e44a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fe879c768a775d7d64b49e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 1 11:36:06 2009 +0200 wined3d: Get rid of stateblock_savedstates_copy(). This is redundant because we call stateblock_savedstates_set() further down. --- dlls/wined3d/stateblock.c | 38 -------------------------------------- 1 files changed, 0 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4034f1a..3c6863e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -71,41 +71,6 @@ fail: return E_OUTOFMEMORY; } -/* Copy all members of one stateblock to another */ -static void stateblock_savedstates_copy(SAVEDSTATES *dest, const SAVEDSTATES *source, - const struct wined3d_gl_info *gl_info) -{ - /* Single values */ - dest->primitive_type = source->primitive_type; - dest->indices = source->indices; - dest->material = source->material; - dest->viewport = source->viewport; - dest->vertexDecl = source->vertexDecl; - dest->pixelShader = source->pixelShader; - dest->vertexShader = source->vertexShader; - dest->scissorRect = dest->scissorRect; - - /* Fixed size arrays */ - dest->streamSource = source->streamSource; - dest->streamFreq = source->streamFreq; - dest->textures = source->textures; - memcpy(dest->transform, source->transform, sizeof(source->transform)); - memcpy(dest->renderState, source->renderState, sizeof(source->renderState)); - memcpy(dest->textureState, source->textureState, sizeof(source->textureState)); - memcpy(dest->samplerState, source->samplerState, sizeof(source->samplerState)); - dest->clipplane = source->clipplane; - dest->pixelShaderConstantsB = source->pixelShaderConstantsB; - dest->pixelShaderConstantsI = source->pixelShaderConstantsI; - dest->vertexShaderConstantsB = source->vertexShaderConstantsB; - dest->vertexShaderConstantsI = source->vertexShaderConstantsI; - - /* Dynamically sized arrays */ - memcpy(dest->pixelShaderConstantsF, source->pixelShaderConstantsF, - sizeof(BOOL) * gl_info->max_pshader_constantsF); - memcpy(dest->vertexShaderConstantsF, source->vertexShaderConstantsF, - sizeof(BOOL) * gl_info->max_vshader_constantsF); -} - static inline void stateblock_set_bits(DWORD *map, UINT map_size) { DWORD mask = (1 << (map_size & 0x1f)) - 1; @@ -1484,9 +1449,6 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * /* Otherwise, might as well set the whole state block to the appropriate values */ if (device->stateBlock) { - /* Saved states */ - stateblock_savedstates_copy(&stateblock->changed, &device->stateBlock->changed, gl_info); - /* Saved values */ stateblock_copy_values(stateblock, device->stateBlock, gl_info); }

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 2009