December 2011 - Wine-commits

Matteo Bruni : wined3d: Fix some flag checks.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: fdd4df446fa572e7ff7ef318f1c878b8054a5687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd4df446fa572e7ff7ef318f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 12 20:25:16 2011 +0100 wined3d: Fix some flag checks. --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ecb2c03..8b152d3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2134,7 +2134,7 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, src0_name); shader_addline(buffer, "DP3 %s.y, fragment.texcoord[%u], %s;\n", dst_reg, reg, src0_name); flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3D_PSARGS_PROJECTED ? TEX_PROJ : 0, NULL, NULL); } static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) @@ -2177,7 +2177,7 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0; - shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); + shader_hw_sample(ins, reg, dst_str, dst_name, flags & WINED3D_PSARGS_PROJECTED ? TEX_PROJ : 0, NULL, NULL); tex_mx->current_row = 0; } @@ -2218,7 +2218,7 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3D_PSARGS_PROJECTED ? TEX_PROJ : 0, NULL, NULL); tex_mx->current_row = 0; } @@ -2259,7 +2259,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) /* Sample the texture using the calculated coordinates */ shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); flags = reg < MAX_TEXTURES ? priv->cur_ps_args->super.tex_transform >> reg * WINED3D_PSARGS_TEXTRANSFORM_SHIFT : 0; - shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3DTTFF_PROJECTED ? TEX_PROJ : 0, NULL, NULL); + shader_hw_sample(ins, reg, dst_str, dst_reg, flags & WINED3D_PSARGS_PROJECTED ? TEX_PROJ : 0, NULL, NULL); tex_mx->current_row = 0; }

1 0

Matteo Bruni : wined3d: Ignore invalid texture transform flags.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 68e0cd430f2e57e55278acd2422127330628eb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e0cd430f2e57e55278acd24… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 12 20:25:17 2011 +0100 wined3d: Ignore invalid texture transform flags. --- dlls/wined3d/shader.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 11be333..4823750 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1911,9 +1911,28 @@ void find_ps_compile_args(const struct wined3d_state *state, for (i = 0; i < 4; ++i) { DWORD flags = state->texture_states[i][WINED3DTSS_TEXTURETRANSFORMFLAGS]; - DWORD tex_transform = flags & ~WINED3DTTFF_PROJECTED; + DWORD count, tex_transform; + + /* Filter some invalid flags */ + count = flags & ~WINED3DTTFF_PROJECTED; + if (count > WINED3DTTFF_COUNT4) + { + WARN("The application set an invalid TEXTURETRANSFORMFLAGS value.\n"); + flags = count = 0; + } + + tex_transform = count; if (flags & WINED3DTTFF_PROJECTED) - tex_transform |= WINED3D_PSARGS_PROJECTED; + { + enum wined3d_sampler_texture_type sampler_type = shader->reg_maps.sampler_type[i]; + + if ((sampler_type == WINED3DSTT_1D && tex_transform > WINED3DTTFF_COUNT1) + || (sampler_type == WINED3DSTT_2D && tex_transform > WINED3DTTFF_COUNT2) + || (sampler_type == WINED3DSTT_VOLUME && tex_transform > WINED3DTTFF_COUNT3)) + tex_transform |= WINED3D_PSARGS_PROJECTED; + else + WARN("Application requested projected texture with unsuitable texture coordinates.\n"); + } args->tex_transform |= tex_transform << i * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; } }

1 0

Henri Verbeet : ddraw: Move clipper handling to ddraw.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: e6fb4537f00cd1e94ff11dd85b7b07b58245ec45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fb4537f00cd1e94ff11dd85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 12 20:53:55 2011 +0100 ddraw: Move clipper handling to ddraw. --- dlls/ddraw/clipper.c | 304 ++++++++++++++++------------------------ dlls/ddraw/ddraw.c | 18 +-- dlls/ddraw/ddraw_private.h | 15 +-- dlls/ddraw/surface.c | 14 +-- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/clipper.c | 161 --------------------- dlls/wined3d/surface.c | 23 +--- dlls/wined3d/wined3d.spec | 11 -- dlls/wined3d/wined3d_private.h | 10 -- include/wine/wined3d.h | 13 -- 10 files changed, 138 insertions(+), 432 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6fb4537f00cd1e94ff11…

1 0

Henri Verbeet : ddraw: Add support for clipped blits.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 10d2a9375ddfac47de8957c7d126a28d82f15701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d2a9375ddfac47de8957c7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 12 20:53:56 2011 +0100 ddraw: Add support for clipped blits. --- dlls/ddraw/surface.c | 136 ++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 122 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 86d02c5..d110acc 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1270,6 +1270,125 @@ static HRESULT WINAPI ddraw_surface1_Flip(IDirectDrawSurface *iface, IDirectDraw dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); } +static HRESULT ddraw_surface_blt_clipped(IDirectDrawSurfaceImpl *dst_surface, const RECT *dst_rect_in, + IDirectDrawSurfaceImpl *src_surface, const RECT *src_rect_in, DWORD flags, + const WINEDDBLTFX *fx, WINED3DTEXTUREFILTERTYPE filter) +{ + struct wined3d_surface *wined3d_src_surface = src_surface ? src_surface->wined3d_surface : NULL; + RECT src_rect, dst_rect; + float scale_x, scale_y; + const RECT *clip_rect; + UINT clip_list_size; + RGNDATA *clip_list; + HRESULT hr = DD_OK; + UINT i; + + if (!dst_surface->clipper) + { + if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + hr = ddraw_surface_update_frontbuffer(src_surface, src_rect_in, TRUE); + if (SUCCEEDED(hr)) + hr = wined3d_surface_blt(dst_surface->wined3d_surface, dst_rect_in, + wined3d_src_surface, src_rect_in, flags, fx, filter); + if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) + hr = ddraw_surface_update_frontbuffer(dst_surface, dst_rect_in, FALSE); + + return hr; + } + + if (!dst_rect_in) + { + dst_rect.left = 0; + dst_rect.top = 0; + dst_rect.right = dst_surface->surface_desc.dwWidth; + dst_rect.bottom = dst_surface->surface_desc.dwHeight; + } + else + { + dst_rect = *dst_rect_in; + } + + if (IsRectEmpty(&dst_rect)) + return DDERR_INVALIDRECT; + + if (src_surface) + { + if (!src_rect_in) + { + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = src_surface->surface_desc.dwWidth; + src_rect.bottom = src_surface->surface_desc.dwHeight; + } + else + { + src_rect = *src_rect_in; + } + + if (IsRectEmpty(&src_rect)) + return DDERR_INVALIDRECT; + } + else + { + SetRect(&src_rect, 0, 0, 0, 0); + } + + scale_x = (float)(src_rect.right - src_rect.left) / (float)(dst_rect.right - dst_rect.left); + scale_y = (float)(src_rect.bottom - src_rect.top) / (float)(dst_rect.bottom - dst_rect.top); + + if (FAILED(hr = IDirectDrawClipper_GetClipList(&dst_surface->clipper->IDirectDrawClipper_iface, + &dst_rect, NULL, &clip_list_size))) + { + WARN("Failed to get clip list size, hr %#x.\n", hr); + return hr; + } + + if (!(clip_list = HeapAlloc(GetProcessHeap(), 0, clip_list_size))) + { + WARN("Failed to allocate clip list.\n"); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = IDirectDrawClipper_GetClipList(&dst_surface->clipper->IDirectDrawClipper_iface, + &dst_rect, clip_list, &clip_list_size))) + { + WARN("Failed to get clip list, hr %#x.\n", hr); + return hr; + } + + clip_rect = (RECT *)clip_list->Buffer; + for (i = 0; i < clip_list->rdh.nCount; ++i) + { + RECT src_rect_clipped = src_rect; + + if (src_surface) + { + src_rect_clipped.left += (clip_rect[i].left - dst_rect.left) * scale_x; + src_rect_clipped.top += (clip_rect[i].top - dst_rect.top) * scale_y; + src_rect_clipped.right -= (dst_rect.right - clip_rect[i].right) * scale_x; + src_rect_clipped.bottom -= (dst_rect.bottom - clip_rect[i].bottom) * scale_y; + + if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + { + if (FAILED(hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect_clipped, TRUE))) + break; + } + } + + if (FAILED(hr = wined3d_surface_blt(dst_surface->wined3d_surface, &clip_rect[i], + wined3d_src_surface, &src_rect_clipped, flags, fx, filter))) + break; + + if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + { + if (FAILED(hr = ddraw_surface_update_frontbuffer(dst_surface, &clip_rect[i], FALSE))) + break; + } + } + + return hr; +} + /***************************************************************************** * IDirectDrawSurface7::Blt * @@ -1322,13 +1441,8 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR * does, copy the struct, and replace the ddraw surfaces with the wined3d * surfaces. So far no blitting operations using surfaces in the bltfx * struct are supported anyway. */ - if (Src && Src->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) - hr = ddraw_surface_update_frontbuffer(Src, SrcRect, TRUE); - if (SUCCEEDED(hr)) - hr = wined3d_surface_blt(This->wined3d_surface, DestRect, Src ? Src->wined3d_surface : NULL, - SrcRect, Flags, (WINEDDBLTFX *)DDBltFx, WINED3DTEXF_LINEAR); - if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) - hr = ddraw_surface_update_frontbuffer(This, DestRect, FALSE); + hr = ddraw_surface_blt_clipped(This, DestRect, Src, SrcRect, + Flags, (WINEDDBLTFX *)DDBltFx, WINED3DTEXF_LINEAR); wined3d_mutex_unlock(); switch(hr) @@ -3756,13 +3870,7 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d flags |= WINEDDBLT_DONOTWAIT; wined3d_mutex_lock(); - if (src->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) - hr = ddraw_surface_update_frontbuffer(src, rsrc, TRUE); - if (SUCCEEDED(hr)) - hr = wined3d_surface_blt(This->wined3d_surface, &dst_rect, - src->wined3d_surface, rsrc, flags, NULL, WINED3DTEXF_POINT); - if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) - hr = ddraw_surface_update_frontbuffer(This, &dst_rect, FALSE); + hr = ddraw_surface_blt_clipped(This, &dst_rect, src, rsrc, flags, NULL, WINED3DTEXF_POINT); wined3d_mutex_unlock(); switch(hr)

1 0

Henri Verbeet : wined3d: Use the correct source pitch and byte_count for uploading converted surfaces .
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 943fcb0fc42c1f65f54a1c41267ba7fa01109c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=943fcb0fc42c1f65f54a1c412… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 12 20:53:57 2011 +0100 wined3d: Use the correct source pitch and byte_count for uploading converted surfaces. --- dlls/wined3d/surface.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0457ac6..bd45ae3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6038,6 +6038,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, return E_OUTOFMEMORY; } format.convert(surface->resource.allocatedMemory, mem, src_pitch, width, height); + format.byte_count = format.conv_byte_count; + src_pitch = dst_pitch; } else if (convert != NO_CONVERSION && surface->resource.allocatedMemory) { @@ -6056,6 +6058,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } d3dfmt_convert_surface(surface->resource.allocatedMemory, mem, src_pitch, width, height, dst_pitch, convert, surface); + format.byte_count = format.conv_byte_count; + src_pitch = dst_pitch; } else {

1 0

Henri Verbeet : wined3d: Get rid of the WINEDDCAPS typedef.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: ebb85da5f7b1457e20555d97ea615c57578b0db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb85da5f7b1457e20555d97e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 12 20:53:58 2011 +0100 wined3d: Get rid of the WINEDDCAPS typedef. --- dlls/ddraw/ddraw.c | 35 ++++++++++++++++++----------------- dlls/wined3d/directx.c | 44 ++++++++++++++++++++++---------------------- include/wine/wined3d.h | 42 +++++++++++++++++++++--------------------- 3 files changed, 61 insertions(+), 60 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7ff9a73..854ab9e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1197,21 +1197,21 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD return hr; } - caps.dwCaps = winecaps.DirectDrawCaps.Caps; - caps.dwCaps2 = winecaps.DirectDrawCaps.Caps2; - caps.dwCKeyCaps = winecaps.DirectDrawCaps.CKeyCaps; - caps.dwFXCaps = winecaps.DirectDrawCaps.FXCaps; - caps.dwPalCaps = winecaps.DirectDrawCaps.PalCaps; - caps.ddsCaps.dwCaps = winecaps.DirectDrawCaps.ddsCaps; - caps.dwSVBCaps = winecaps.DirectDrawCaps.SVBCaps; - caps.dwSVBCKeyCaps = winecaps.DirectDrawCaps.SVBCKeyCaps; - caps.dwSVBFXCaps = winecaps.DirectDrawCaps.SVBFXCaps; - caps.dwVSBCaps = winecaps.DirectDrawCaps.VSBCaps; - caps.dwVSBCKeyCaps = winecaps.DirectDrawCaps.VSBCKeyCaps; - caps.dwVSBFXCaps = winecaps.DirectDrawCaps.VSBFXCaps; - caps.dwSSBCaps = winecaps.DirectDrawCaps.SSBCaps; - caps.dwSSBCKeyCaps = winecaps.DirectDrawCaps.SSBCKeyCaps; - caps.dwSSBFXCaps = winecaps.DirectDrawCaps.SSBFXCaps; + caps.dwCaps = winecaps.ddraw_caps.caps; + caps.dwCaps2 = winecaps.ddraw_caps.caps2; + caps.dwCKeyCaps = winecaps.ddraw_caps.color_key_caps; + caps.dwFXCaps = winecaps.ddraw_caps.fx_caps; + caps.dwPalCaps = winecaps.ddraw_caps.pal_caps; + caps.ddsCaps.dwCaps = winecaps.ddraw_caps.dds_caps; + caps.dwSVBCaps = winecaps.ddraw_caps.svb_caps; + caps.dwSVBCKeyCaps = winecaps.ddraw_caps.svb_color_key_caps; + caps.dwSVBFXCaps = winecaps.ddraw_caps.svb_fx_caps; + caps.dwVSBCaps = winecaps.ddraw_caps.vsb_caps; + caps.dwVSBCKeyCaps = winecaps.ddraw_caps.vsb_color_key_caps; + caps.dwVSBFXCaps = winecaps.ddraw_caps.vsb_fx_caps; + caps.dwSSBCaps = winecaps.ddraw_caps.ssb_caps; + caps.dwSSBCKeyCaps = winecaps.ddraw_caps.ssb_color_key_caps; + caps.dwSSBFXCaps = winecaps.ddraw_caps.ssb_fx_caps; /* Even if WineD3D supports 3D rendering, remove the cap if ddraw is configured * not to use it @@ -1220,9 +1220,10 @@ static HRESULT WINAPI ddraw7_GetCaps(IDirectDraw7 *iface, DDCAPS *DriverCaps, DD caps.dwCaps &= ~DDCAPS_3D; caps.ddsCaps.dwCaps &= ~(DDSCAPS_3DDEVICE | DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | DDSCAPS_ZBUFFER); } - if(winecaps.DirectDrawCaps.StrideAlign != 0) { + if (winecaps.ddraw_caps.stride_align) + { caps.dwCaps |= DDCAPS_ALIGNSTRIDE; - caps.dwAlignStrideAlign = winecaps.DirectDrawCaps.StrideAlign; + caps.dwAlignStrideAlign = winecaps.ddraw_caps.stride_align; } if(DriverCaps) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fe77b88..a0f716b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4899,28 +4899,28 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDPCAPS_PRIMARYSURFACE; /* Fill the ddraw caps structure */ - caps->DirectDrawCaps.Caps = WINEDDCAPS_GDI | + caps->ddraw_caps.caps = WINEDDCAPS_GDI | WINEDDCAPS_PALETTE | blit_caps; - caps->DirectDrawCaps.Caps2 = WINEDDCAPS2_CERTIFIED | - WINEDDCAPS2_NOPAGELOCKREQUIRED | - WINEDDCAPS2_PRIMARYGAMMA | - WINEDDCAPS2_WIDESURFACES | + caps->ddraw_caps.caps2 = WINEDDCAPS2_CERTIFIED | + WINEDDCAPS2_NOPAGELOCKREQUIRED | + WINEDDCAPS2_PRIMARYGAMMA | + WINEDDCAPS2_WIDESURFACES | WINEDDCAPS2_CANRENDERWINDOWED; - caps->DirectDrawCaps.CKeyCaps = ckey_caps; - caps->DirectDrawCaps.FXCaps = fx_caps; - caps->DirectDrawCaps.PalCaps = pal_caps; - caps->DirectDrawCaps.SVBCaps = blit_caps; - caps->DirectDrawCaps.SVBCKeyCaps = ckey_caps; - caps->DirectDrawCaps.SVBFXCaps = fx_caps; - caps->DirectDrawCaps.VSBCaps = blit_caps; - caps->DirectDrawCaps.VSBCKeyCaps = ckey_caps; - caps->DirectDrawCaps.VSBFXCaps = fx_caps; - caps->DirectDrawCaps.SSBCaps = blit_caps; - caps->DirectDrawCaps.SSBCKeyCaps = ckey_caps; - caps->DirectDrawCaps.SSBFXCaps = fx_caps; - - caps->DirectDrawCaps.ddsCaps = WINEDDSCAPS_ALPHA | + caps->ddraw_caps.color_key_caps = ckey_caps; + caps->ddraw_caps.fx_caps = fx_caps; + caps->ddraw_caps.pal_caps = pal_caps; + caps->ddraw_caps.svb_caps = blit_caps; + caps->ddraw_caps.svb_color_key_caps = ckey_caps; + caps->ddraw_caps.svb_fx_caps = fx_caps; + caps->ddraw_caps.vsb_caps = blit_caps; + caps->ddraw_caps.vsb_color_key_caps = ckey_caps; + caps->ddraw_caps.vsb_fx_caps = fx_caps; + caps->ddraw_caps.ssb_caps = blit_caps; + caps->ddraw_caps.ssb_color_key_caps = ckey_caps; + caps->ddraw_caps.ssb_fx_caps = fx_caps; + + caps->ddraw_caps.dds_caps = WINEDDSCAPS_ALPHA | WINEDDSCAPS_BACKBUFFER | WINEDDSCAPS_FLIP | WINEDDSCAPS_FRONTBUFFER | @@ -4930,16 +4930,16 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDSCAPS_SYSTEMMEMORY | WINEDDSCAPS_VIDEOMEMORY | WINEDDSCAPS_VISIBLE; - caps->DirectDrawCaps.StrideAlign = DDRAW_PITCH_ALIGNMENT; + caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT; /* Set D3D caps if OpenGL is available. */ if (adapter->opengl) { - caps->DirectDrawCaps.ddsCaps |= WINEDDSCAPS_3DDEVICE | + caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE | WINEDDSCAPS_MIPMAP | WINEDDSCAPS_TEXTURE | WINEDDSCAPS_ZBUFFER; - caps->DirectDrawCaps.Caps |= WINEDDCAPS_3D; + caps->ddraw_caps.caps |= WINEDDCAPS_3D; } return WINED3D_OK; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cffb206..6598439 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1757,27 +1757,27 @@ struct wined3d_pixel_shader_caps INT instruction_slot_count; }; -typedef struct _WINEDDCAPS +struct wined3d_ddraw_caps { - DWORD Caps; - DWORD Caps2; - DWORD CKeyCaps; - DWORD FXCaps; - DWORD FXAlphaCaps; - DWORD PalCaps; - DWORD SVCaps; - DWORD SVBCaps; - DWORD SVBCKeyCaps; - DWORD SVBFXCaps; - DWORD VSBCaps; - DWORD VSBCKeyCaps; - DWORD VSBFXCaps; - DWORD SSBCaps; - DWORD SSBCKeyCaps; - DWORD SSBFXCaps; - DWORD ddsCaps; - DWORD StrideAlign; -} WINEDDCAPS; + DWORD caps; + DWORD caps2; + DWORD color_key_caps; + DWORD fx_caps; + DWORD fx_alpha_caps; + DWORD pal_caps; + DWORD sv_caps; + DWORD svb_caps; + DWORD svb_color_key_caps; + DWORD svb_fx_caps; + DWORD vsb_caps; + DWORD vsb_color_key_caps; + DWORD vsb_fx_caps; + DWORD ssb_caps; + DWORD ssb_color_key_caps; + DWORD ssb_fx_caps; + DWORD dds_caps; + DWORD stride_align; +}; typedef struct _WINED3DCAPS { @@ -1868,7 +1868,7 @@ typedef struct _WINED3DCAPS DWORD Reserved2; /* Not in the microsoft headers but documented */ DWORD Reserved3; - WINEDDCAPS DirectDrawCaps; + struct wined3d_ddraw_caps ddraw_caps; } WINED3DCAPS; struct wined3d_color_key

1 0

Alexandre Julliard : gdi32: Remove support for private color maps.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: d357392b8b2cdc434726db885f77f8d1bd6e3ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d357392b8b2cdc434726db885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 15:58:05 2011 +0100 gdi32: Remove support for private color maps. --- dlls/gdi32/dibdrv/dc.c | 33 +++++---------------------------- dlls/gdi32/dibdrv/dibdrv.h | 7 ++----- dlls/gdi32/dibdrv/primitives.c | 2 +- 3 files changed, 8 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index ed7b0f7..c4921a3 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -68,7 +68,7 @@ static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) } static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, - RGBQUAD *color_table, void *bits, enum dib_info_flags flags) + const RGBQUAD *color_table, void *bits, enum dib_info_flags flags) { dib->bit_count = bi->biBitCount; dib->width = bi->biWidth; @@ -79,7 +79,6 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD dib->bits.is_copy = FALSE; dib->bits.free = NULL; dib->bits.param = NULL; - dib->flags = flags; if(dib->height < 0) /* top-down */ { @@ -143,19 +142,12 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD if (color_table && bi->biClrUsed) { - if (flags & private_color_table) - { - dib->color_table = HeapAlloc(GetProcessHeap(), 0, bi->biClrUsed * sizeof(dib->color_table[0])); - if(!dib->color_table) return FALSE; - memcpy(dib->color_table, color_table, bi->biClrUsed * sizeof(color_table[0])); - } - else - dib->color_table = color_table; + dib->color_table = color_table; dib->color_table_size = bi->biClrUsed; } else if (flags & default_color_table) { - dib->color_table = (RGBQUAD *)get_default_color_table( dib->bit_count ); + dib->color_table = get_default_color_table( dib->bit_count ); dib->color_table_size = dib->color_table ? (1 << dib->bit_count) : 0; } else @@ -170,7 +162,7 @@ static BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) { return init_dib_info( dib, &info->bmiHeader, (const DWORD *)info->bmiColors, - (RGBQUAD *)info->bmiColors, bits, flags ); + info->bmiColors, bits, flags ); } BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) @@ -208,9 +200,6 @@ static void clear_dib_info(dib_info *dib) */ void free_dib_info(dib_info *dib) { - if (dib->flags & private_color_table) - HeapFree(GetProcessHeap(), 0, dib->color_table); - if (dib->bits.free) dib->bits.free( &dib->bits ); clear_dib_info( dib ); } @@ -229,19 +218,7 @@ void copy_dib_color_info(dib_info *dst, const dib_info *src) dst->blue_shift = src->blue_shift; dst->funcs = src->funcs; dst->color_table_size = src->color_table_size; - dst->color_table = NULL; - dst->flags = src->flags; - if(dst->color_table_size) - { - int size = dst->color_table_size * sizeof(dst->color_table[0]); - if (dst->flags & private_color_table) - { - dst->color_table = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(dst->color_table, src->color_table, size); - } - else - dst->color_table = src->color_table; - } + dst->color_table = src->color_table; } DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index d388f91..524032a 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -20,8 +20,7 @@ enum dib_info_flags { - private_color_table = 1, - default_color_table = 2 + default_color_table = 1 }; typedef struct @@ -35,11 +34,9 @@ typedef struct int red_shift, green_shift, blue_shift; int red_len, green_len, blue_len; - RGBQUAD *color_table; + const RGBQUAD *color_table; DWORD color_table_size; - enum dib_info_flags flags; - const struct primitive_funcs *funcs; } dib_info; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index d0d838b..07911b2 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -1391,7 +1391,7 @@ static DWORD rgb_to_pixel_colortable(const dib_info *dib, BYTE r, BYTE g, BYTE b for(i = 0; i < dib->color_table_size; i++) { - RGBQUAD *cur = dib->color_table + i; + const RGBQUAD *cur = dib->color_table + i; diff = (r - cur->rgbRed) * (r - cur->rgbRed) + (g - cur->rgbGreen) * (g - cur->rgbGreen) + (b - cur->rgbBlue) * (b - cur->rgbBlue);

1 0

Alexandre Julliard : gdi32: init_dib_info() can no longer fail, and no longer requires freeing.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: cae4ef81e65a559c77ecdbbd88deb11d34be7bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae4ef81e65a559c77ecdbbd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 16:11:17 2011 +0100 gdi32: init_dib_info() can no longer fail, and no longer requires freeing. --- dlls/gdi32/dibdrv/bitblt.c | 42 ++++++++++-------------------------------- dlls/gdi32/dibdrv/dc.c | 39 +++++++++++++++++---------------------- dlls/gdi32/dibdrv/dibdrv.h | 8 +++----- dlls/gdi32/dibdrv/graphics.c | 3 +-- dlls/gdi32/dibdrv/objects.c | 2 -- 5 files changed, 31 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cae4ef81e65a559c77ecd…

1 0

Alexandre Julliard : gdi32: Implement GetNearestColor in the DIB driver.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 49ae7360228348bbe6f188daa1a2b388ea327258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ae7360228348bbe6f188daa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 20:20:06 2011 +0100 gdi32: Implement GetNearestColor in the DIB driver. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 14 ++++++++++++++ dlls/gdi32/tests/bitmap.c | 2 ++ 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 66c9234..571a070 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -530,7 +530,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pGetICMProfile */ dibdrv_GetImage, /* pGetImage */ NULL, /* pGetKerningPairs */ - NULL, /* pGetNearestColor */ + dibdrv_GetNearestColor, /* pGetNearestColor */ NULL, /* pGetOutlineTextMetrics */ dibdrv_GetPixel, /* pGetPixel */ NULL, /* pGetPixelFormat */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index cd96e3e..6c63c3d 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -124,6 +124,7 @@ extern BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) DECLSPEC_HIDDEN; extern DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; +extern COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 439a10f..67f1c99 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -392,6 +392,20 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, } /*********************************************************************** + * dibdrv_GetNearestColor + */ +COLORREF dibdrv_GetNearestColor( PHYSDEV dev, COLORREF color ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev( dev ); + DWORD pixel; + + TRACE( "(%p, %08x)\n", dev, color ); + + pixel = get_pixel_color( pdev, color, FALSE ); + return pdev->dib.funcs->pixel_to_colorref( &pdev->dib, pixel ); +} + +/*********************************************************************** * dibdrv_GetPixel */ COLORREF dibdrv_GetPixel( PHYSDEV dev, INT x, INT y ) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index accfc91..6e8e1d4 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -346,6 +346,8 @@ static void test_dib_info(HBITMAP hbm, const void *bits, const BITMAPINFOHEADER ok(c == exp, "SetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ c = GetPixel(hdc, 0, 0); \ ok(c == exp, "GetPixel failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ + c = GetNearestColor(hdc, color); \ + ok(c == exp, "GetNearestColor failed: got 0x%06x expected 0x%06x\n", c, (UINT)exp); \ } static void test_dib_bits_access( HBITMAP hdib, void *bits )

1 0

Alexandre Julliard : gdi32: Remove some color table size checks, we use full-size color tables now.
by Alexandre Julliard 13 Dec '11

13 Dec '11

Module: wine Branch: master Commit: 0c194895a295ff06368e70cd8ccdd19bc31840d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c194895a295ff06368e70cd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 20:52:41 2011 +0100 gdi32: Remove some color table size checks, we use full-size color tables now. --- dlls/gdi32/dibdrv/bitblt.c | 5 +-- dlls/gdi32/dibdrv/primitives.c | 73 ++++++++++++++++++---------------------- 2 files changed, 35 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c194895a295ff06368e7…

1 0