March 2010 - Wine-commits - list.winehq.org

Christian Costa : d3dx9_36: Add stub for D3DXCreateEffect.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 62981582dd447b3b424591ad707194045d6cdaf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62981582dd447b3b424591ad7… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:55:23 2010 +0100 d3dx9_36: Add stub for D3DXCreateEffect. --- dlls/d3dx9_36/Makefile.in | 1 + dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/effect.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 39b6d84..8bbd78d 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -9,6 +9,7 @@ IMPORTS = d3d9 gdi32 user32 kernel32 C_SRCS = \ core.c \ d3dx9_36_main.c \ + effect.c \ font.c \ math.c \ mesh.c \ diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 2034a04..fbcce68 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -46,7 +46,7 @@ @ stub D3DXCreateCubeTextureFromResourceExW @ stub D3DXCreateCubeTextureFromResourceW @ stub D3DXCreateCylinder -@ stub D3DXCreateEffect +@ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) @ stub D3DXCreateEffectCompiler @ stub D3DXCreateEffectCompilerFromFileA @ stub D3DXCreateEffectCompilerFromFileW diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c new file mode 100644 index 0000000..92c6f78 --- /dev/null +++ b/dlls/d3dx9_36/effect.c @@ -0,0 +1,45 @@ +/* + * Copyright 2010 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "windef.h" +#include "wingdi.h" +#include "d3dx9.h" +#include "d3dx9effect.h" +#include "d3dx9_36_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + +HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, + LPCVOID srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT* effect, + LPD3DXBUFFER* compilation_errors) +{ + FIXME("(%p, %p, %u, %p, %p, %#x, %p, %p, %p): stub\n", device, srcdata, srcdatalen, defines, include, flags, + pool, effect, compilation_errors); + + return E_NOTIMPL; +}

1 0

Henri Verbeet : wined3d: Simplify the generated GLSL for NRM.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 4cd69b8a097f16012f5c6ba3a6237df3495fba97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd69b8a097f16012f5c6ba3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 19 13:19:50 2010 +0100 wined3d: Simplify the generated GLSL for NRM. --- dlls/wined3d/glsl_shader.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2d057f7..9bce13b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2164,16 +2164,26 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; glsl_src_param_t src_param; + unsigned int mask_size; DWORD write_mask; char dst_mask[6]; write_mask = shader_glsl_get_write_mask(ins->dst, dst_mask); + mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); shader_addline(buffer, "tmp0.x = length(%s);\n", src_param.param_str); shader_glsl_append_dst(buffer, ins); - shader_addline(buffer, "tmp0.x == 0.0 ? (%s * FLT_MAX) : (%s / tmp0.x));", - src_param.param_str, src_param.param_str); + if (mask_size > 1) + { + shader_addline(buffer, "tmp0.x == 0.0 ? vec%u(0.0) : (%s / tmp0.x));\n", + mask_size, src_param.param_str); + } + else + { + shader_addline(buffer, "tmp0.x == 0.0 ? 0.0 : (%s / tmp0.x));\n", + src_param.param_str); + } } /** Process the WINED3DSIO_EXPP instruction in GLSL:

1 0

Christian Costa : d3dx9_36: Fix method name.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 312aa4996ec87ddc44a163944c8c07a37257679e URL: http://source.winehq.org/git/wine.git/?a=commit;h=312aa4996ec87ddc44a163944… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:54:17 2010 +0100 d3dx9_36: Fix method name. --- dlls/d3dx9_36/shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index a87911e..23c3cdd 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -401,7 +401,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantT return NULL; } -static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByElement(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) +static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; @@ -583,7 +583,7 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = ID3DXConstantTableImpl_GetSamplerIndex, ID3DXConstantTableImpl_GetConstant, ID3DXConstantTableImpl_GetConstantByName, - ID3DXConstantTableImpl_GetConstantByElement, + ID3DXConstantTableImpl_GetConstantElement, ID3DXConstantTableImpl_SetDefaults, ID3DXConstantTableImpl_SetValue, ID3DXConstantTableImpl_SetBool,

1 0

Christian Costa : d3dx9_36: Use %u to print unsigned integer.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 8da1d69c2278a61805c568fd50fe5a65a2c238e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da1d69c2278a61805c568fd5… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:55:54 2010 +0100 d3dx9_36: Use %u to print unsigned integer. --- dlls/d3dx9_36/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f0773b9..3ab4541 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -30,7 +30,7 @@ HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, D3DPOOL pool, LPDIRECT3DTEXTURE9 *ppTexture) { - FIXME("(%p, %d, %d, %d, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format, + FIXME("(%p, %u, %u, %u, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format, pool, ppTexture); return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL); @@ -52,7 +52,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, PALETTEENTRY* palette, LPDIRECT3DTEXTURE9* texture) { - FIXME("(%p, %p, %d, %d, %d, %d, %x, %x, %x, %d, %d, %x, %p, %p, %p): stub\n", device, srcdata, srcdatasize, width, + FIXME("(%p, %p, %u, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): stub\n", device, srcdata, srcdatasize, width, height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); return E_NOTIMPL;

1 0

Detlef Riekenberg : msvcr90: Implement _initterm_e.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 40509127a44ff6ee052afa17f44337cfa5515641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40509127a44ff6ee052afa17f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 19 12:28:53 2010 +0100 msvcr90: Implement _initterm_e. --- dlls/msvcr90/msvcr90.c | 32 ++++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 4bef02c..e7baa6f 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -22,7 +22,15 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(msvcr90); + +typedef int (CDECL *_INITTERM_E_FN)(void); + +/********************************************************************* + * DllMain (MSVCR90.@) + */ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { switch (reason) @@ -35,3 +43,27 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) } return TRUE; } + + +/********************************************************************* + * _initterm_e (MSVCR90.@) + * + * call an array of application initialization functions and report the return value + */ +int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) +{ + int res = 0; + + TRACE("(%p, %p)\n", table, end); + + while (!res && table < end) { + if (*table) { + res = (**table)(); + if (res) + TRACE("function %p failed: 0x%x\n", *table, res); + + } + table++; + } + return res; +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 27ad21d..32c4688 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -517,7 +517,7 @@ @ stub _i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm -@ stub _initterm_e +@ cdecl _initterm_e(ptr ptr) @ stub _inp @ stub _inpd @ stub _inpw

1 0

Roderick Colenbrander : wined3d: Add a helper function for drawing a textured quad.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 4bd627cc7f4f613eea640bed1379f1ad61c0a7f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd627cc7f4f613eea640bed1… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 17 13:56:18 2010 +0100 wined3d: Add a helper function for drawing a textured quad. --- dlls/wined3d/surface.c | 124 ++++++++++++++++++++++++++++-------------------- 1 files changed, 72 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d55b73c..c24a5e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -273,6 +273,62 @@ static void surface_get_blt_info(GLenum target, const RECT *rect_in, GLsizei w, } } +/* GL locking and context activation is done by the caller */ +static void draw_textured_quad(IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) +{ + IWineD3DBaseTextureImpl *texture; + struct blt_info info; + + surface_get_blt_info(src_surface->texture_target, src_rect, src_surface->pow2Width, src_surface->pow2Height, &info); + + glEnable(info.bind_target); + checkGLcall("glEnable(bind_target)"); + + /* Bind the texture */ + glBindTexture(info.bind_target, src_surface->texture_name); + checkGLcall("glBindTexture"); + + /* Filtering for StretchRect */ + glTexParameteri(info.bind_target, GL_TEXTURE_MAG_FILTER, + wined3d_gl_mag_filter(magLookup, Filter)); + checkGLcall("glTexParameteri"); + glTexParameteri(info.bind_target, GL_TEXTURE_MIN_FILTER, + wined3d_gl_min_mip_filter(minMipLookup, Filter, WINED3DTEXF_NONE)); + checkGLcall("glTexParameteri"); + glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + checkGLcall("glTexEnvi"); + + /* Draw a quad */ + glBegin(GL_TRIANGLE_STRIP); + glTexCoord3fv(info.coords[0]); + glVertex2i(dst_rect->left, dst_rect->top); + + glTexCoord3fv(info.coords[1]); + glVertex2i(dst_rect->right, dst_rect->top); + + glTexCoord3fv(info.coords[2]); + glVertex2i(dst_rect->left, dst_rect->bottom); + + glTexCoord3fv(info.coords[3]); + glVertex2i(dst_rect->right, dst_rect->bottom); + glEnd(); + + /* Unbind the texture */ + glBindTexture(info.bind_target, 0); + checkGLcall("glBindTexture(info->bind_target, 0)"); + + /* We changed the filtering settings on the texture. Inform the + * container about this to get the filters reset properly next draw. */ + if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)src_surface, &IID_IWineD3DBaseTexture, (void **)&texture))) + { + texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; + texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; + texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; + IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture); + } +} HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT alignment, UINT width, UINT height, UINT level, BOOL lockable, BOOL discard, WINED3DMULTISAMPLE_TYPE multisample_type, @@ -4733,73 +4789,37 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT *rect_in) { IWineD3DDeviceImpl *device = This->resource.device; - IWineD3DBaseTextureImpl *texture; struct wined3d_context *context; - RECT rect; - struct blt_info info; + RECT src_rect, dst_rect; if(rect_in) { - rect = *rect_in; + src_rect = *rect_in; } else { - rect.left = 0; - rect.top = 0; - rect.right = This->currentDesc.Width; - rect.bottom = This->currentDesc.Height; + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = This->currentDesc.Width; + src_rect.bottom = This->currentDesc.Height; } - surface_get_blt_info(This->texture_target, &rect, This->pow2Width, This->pow2Height, &info); - context = context_acquire(device, (IWineD3DSurface*)This, CTXUSAGE_BLIT); - - ENTER_GL(); - - glEnable(info.bind_target); - checkGLcall("glEnable(bind_target)"); - glBindTexture(info.bind_target, This->texture_name); - checkGLcall("glBindTexture(bind_target, This->texture_name)"); - glTexParameteri(info.bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri"); - glTexParameteri(info.bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - checkGLcall("glTexParameteri"); - if (context->render_offscreen) { - LONG tmp = rect.top; - rect.top = rect.bottom; - rect.bottom = tmp; + dst_rect.left = src_rect.left; + dst_rect.right = src_rect.right; + dst_rect.top = src_rect.bottom; + dst_rect.bottom = src_rect.top; + } + else + { + dst_rect = src_rect; } - glBegin(GL_TRIANGLE_STRIP); - glTexCoord3fv(info.coords[0]); - glVertex2i(rect.left, rect.top); - - glTexCoord3fv(info.coords[1]); - glVertex2i(rect.right, rect.top); - - glTexCoord3fv(info.coords[2]); - glVertex2i(rect.left, rect.bottom); - - glTexCoord3fv(info.coords[3]); - glVertex2i(rect.right, rect.bottom); - glEnd(); - - glDisable(info.bind_target); - checkGLcall("glDisable(bind_target)"); - + ENTER_GL(); + draw_textured_quad(This, &src_rect, &dst_rect, WINED3DTEXF_POINT); LEAVE_GL(); wglFlush(); /* Flush to ensure ordering across contexts. */ - /* We changed the filtering settings on the texture. Inform the - * container about this to get the filters reset properly next draw. */ - if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)This, &IID_IWineD3DBaseTexture, (void **)&texture))) - { - texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MAGFILTER] = WINED3DTEXF_POINT; - texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MINFILTER] = WINED3DTEXF_POINT; - texture->baseTexture.texture_rgb.states[WINED3DTEXSTA_MIPFILTER] = WINED3DTEXF_NONE; - IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture); - } - context_release(context); }

1 0

Roderick Colenbrander : wined3d: Use draw_textured_quad in BltOverride.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: fd99ab78c25f37c66151773f042f5b14c0d88b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd99ab78c25f37c66151773f0… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 18 22:03:27 2010 +0100 wined3d: Use draw_textured_quad in BltOverride. --- dlls/wined3d/surface.c | 46 +------------------------------------ dlls/wined3d/utils.c | 50 ---------------------------------------- dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 1 insertions(+), 97 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c24a5e4..acc24e5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3964,7 +3964,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const return WINED3D_OK; } else if(Src) { /* Blit from offscreen surface to render target */ - float glTexCoord[4]; DWORD oldCKeyFlags = Src->CKeyFlags; WINEDDCOLORKEY oldBltCKey = Src->SrcBltCKey; struct wined3d_context *context; @@ -4014,14 +4013,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const return WINED3D_OK; } - if(!CalculateTexRect(Src, &SourceRectangle, glTexCoord)) { - /* Fall back to software */ - WARN("(%p) Source texture area (%d,%d)-(%d,%d) is too big\n", Src, - SourceRectangle.left, SourceRectangle.top, - SourceRectangle.right, SourceRectangle.bottom); - return WINED3DERR_INVALIDCALL; - } - /* Color keying: Check if we have to do a color keyed blt, * and if not check if a color key is activated. * @@ -4083,22 +4074,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const ENTER_GL(); - /* Bind the texture */ - glBindTexture(Src->texture_target, Src->texture_name); - checkGLcall("glBindTexture"); - - /* Filtering for StretchRect */ - glTexParameteri(Src->texture_target, GL_TEXTURE_MAG_FILTER, - wined3d_gl_mag_filter(magLookup, Filter)); - checkGLcall("glTexParameteri"); - glTexParameteri(Src->texture_target, GL_TEXTURE_MIN_FILTER, - wined3d_gl_min_mip_filter(minMipLookup, Filter, WINED3DTEXF_NONE)); - checkGLcall("glTexParameteri"); - glTexParameteri(Src->texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(Src->texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP); - glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - checkGLcall("glTexEnvi"); - /* This is for color keying */ if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { glEnable(GL_ALPHA_TEST); @@ -4119,32 +4094,13 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const /* Draw a textured quad */ - glBegin(GL_QUADS); - - glColor3f(1.0f, 1.0f, 1.0f); - glTexCoord2f(glTexCoord[0], glTexCoord[2]); - glVertex3f(rect.x1, rect.y1, 0.0f); - - glTexCoord2f(glTexCoord[0], glTexCoord[3]); - glVertex3f(rect.x1, rect.y2, 0.0f); - - glTexCoord2f(glTexCoord[1], glTexCoord[3]); - glVertex3f(rect.x2, rect.y2, 0.0f); - - glTexCoord2f(glTexCoord[1], glTexCoord[2]); - glVertex3f(rect.x2, rect.y1, 0.0f); - - glEnd(); - checkGLcall("glEnd"); + draw_textured_quad(Src, &SourceRectangle, (RECT*)&rect, Filter); if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { glDisable(GL_ALPHA_TEST); checkGLcall("glDisable(GL_ALPHA_TEST)"); } - glBindTexture(Src->texture_target, 0); - checkGLcall("glBindTexture(Src->texture_target, 0)"); - /* Restore the color key parameters */ Src->CKeyFlags = oldCKeyFlags; Src->SrcBltCKey = oldBltCKey; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 73091ff..19d5949 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2258,56 +2258,6 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) { return size; } -/*********************************************************************** - * CalculateTexRect - * - * Calculates the dimensions of the opengl texture used for blits. - * Handled oversized opengl textures and updates the source rectangle - * accordingly - * - * Params: - * This: Surface to operate on - * Rect: Requested rectangle - * - * Returns: - * TRUE if the texture part can be loaded, - * FALSE otherwise - * - *********************************************************************/ -BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]) -{ - int x1 = Rect->left, x2 = Rect->right; - int y1 = Rect->top, y2 = Rect->bottom; - - TRACE("(%p)->(%d,%d)-(%d,%d)\n", This, - Rect->left, Rect->top, Rect->right, Rect->bottom); - - /* The sizes might be reversed */ - if(Rect->left > Rect->right) { - x1 = Rect->right; - x2 = Rect->left; - } - if(Rect->top > Rect->bottom) { - y1 = Rect->bottom; - y2 = Rect->top; - } - - /* Which rect from the texture do I need? */ - if (This->texture_target == GL_TEXTURE_RECTANGLE_ARB) - { - glTexCoord[0] = (float) Rect->left; - glTexCoord[2] = (float) Rect->top; - glTexCoord[1] = (float) Rect->right; - glTexCoord[3] = (float) Rect->bottom; - } else { - glTexCoord[0] = (float) Rect->left / (float) This->pow2Width; - glTexCoord[2] = (float) Rect->top / (float) This->pow2Height; - glTexCoord[1] = (float) Rect->right / (float) This->pow2Width; - glTexCoord[3] = (float) Rect->bottom / (float) This->pow2Height; - } - return TRUE; -} - void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_settings *settings, BOOL ignore_textype) { #define ARG1 0x01 #define ARG2 0x02 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7ac0665..091e85d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2202,8 +2202,6 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) DECLSPE SFLAG_DS_OFFSCREEN) #define SFLAG_DS_DISCARDED SFLAG_DS_LOCATIONS -BOOL CalculateTexRect(IWineD3DSurfaceImpl *This, RECT *Rect, float glTexCoord[4]) DECLSPEC_HIDDEN; - typedef enum { NO_CONVERSION, CONVERT_PALETTED,

1 0

Roderick Colenbrander : wined3d: Start moving paletted texture support to the blit_shader.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 27a96e477aa8dfa84c33e8e7988f3f8e822ed10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a96e477aa8dfa84c33e8e79… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 18 23:11:55 2010 +0100 wined3d: Start moving paletted texture support to the blit_shader. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 25 +++++++++++++++++-------- dlls/wined3d/utils.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 28be889..b3d63b1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6808,7 +6808,7 @@ static void arbfp_blit_unset(IWineD3DDevice *iface) { LEAVE_GL(); } -static BOOL arbfp_blit_color_fixup_supported(struct color_fixup_desc fixup) +static BOOL arbfp_blit_color_fixup_supported(const struct wined3d_gl_info *gl_info, struct color_fixup_desc fixup) { enum complex_fixup complex_fixup; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f2de807..9b70eb3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3619,7 +3619,7 @@ static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, const struct if (CheckDepthStencilCapability(adapter, adapter_format_desc, check_format_desc)) return TRUE; /* If opengl can't process the format natively, the blitter may be able to convert it */ - if (adapter->blitter->color_fixup_supported(check_format_desc->color_fixup)) + if (adapter->blitter->color_fixup_supported(&adapter->gl_info, check_format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index acc24e5..de19c48 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2078,14 +2078,13 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ Paletted Texture **************** */ - /* Use conversion when the paletted texture extension OR fragment shaders are available. When either - * of the two is available make sure texturing is requested as neither of the two works in - * conjunction with calls like glDraw-/glReadPixels. Further also use conversion in case of color keying. + /* Use conversion when the blit_shader backend supports it. It only supports this in case of + * texturing. Further also use conversion in case of color keying. * Paletted textures can be emulated using shaders but only do that for 2D purposes e.g. situations * in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which * conflicts with this. */ - if (!(gl_info->supported[EXT_PALETTED_TEXTURE] || (device->blitter->color_fixup_supported(This->resource.format_desc->color_fixup) + if (!((device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup) && device->render_targets && This == (IWineD3DSurfaceImpl*)device->render_targets[0])) || colorkey_active || !use_texturing) { @@ -2099,7 +2098,8 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *convert = CONVERT_PALETTED; } } - else if (!gl_info->supported[EXT_PALETTED_TEXTURE] && device->blitter->color_fixup_supported(This->resource.format_desc->color_fixup)) + /* TODO: this check is evil and should die (it basically checks which blitter backend is used) */ + else if (!gl_info->supported[EXT_PALETTED_TEXTURE] && device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup)) { *format = GL_ALPHA; *type = GL_UNSIGNED_BYTE; @@ -4062,7 +4062,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const dump_color_fixup_desc(This->resource.format_desc->color_fixup); } - if (!myDevice->blitter->color_fixup_supported(Src->resource.format_desc->color_fixup)) + if (!myDevice->blitter->color_fixup_supported(&myDevice->adapter->gl_info, Src->resource.format_desc->color_fixup)) { FIXME("Source format %s has an unsupported fixup:\n", debug_d3dformat(Src->resource.format_desc->format)); @@ -4993,7 +4993,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This); } else if (This->resource.format_desc->format == WINED3DFMT_P8_UINT - && (gl_info->supported[EXT_PALETTED_TEXTURE] || device->blitter->color_fixup_supported(This->resource.format_desc->color_fixup))) + && (device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup))) { d3dfmt_p8_upload_palette(iface, gl_info, convert); mem = This->resource.allocatedMemory; @@ -5206,8 +5206,10 @@ static void ffp_blit_unset(IWineD3DDevice *iface) LEAVE_GL(); } -static BOOL ffp_blit_color_fixup_supported(struct color_fixup_desc fixup) +static BOOL ffp_blit_color_fixup_supported(const struct wined3d_gl_info *gl_info, struct color_fixup_desc fixup) { + enum complex_fixup complex_fixup; + if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) { TRACE("Checking support for fixup:\n"); @@ -5221,6 +5223,13 @@ static BOOL ffp_blit_color_fixup_supported(struct color_fixup_desc fixup) return TRUE; } + complex_fixup = get_complex_fixup(fixup); + if(complex_fixup == COMPLEX_FIXUP_P8 && gl_info->supported[EXT_PALETTED_TEXTURE]) + { + TRACE("P8 fixup supported\n"); + return TRUE; + } + TRACE("[FAILED]\n"); return FALSE; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 19d5949..83585d3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1098,8 +1098,11 @@ static void apply_format_fixups(struct wined3d_gl_info *gl_info) gl_info->gl_formats[idx].heightscale = 1.5f; gl_info->gl_formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); - idx = getFmtIdx(WINED3DFMT_P8_UINT); - gl_info->gl_formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); + if (gl_info->supported[EXT_PALETTED_TEXTURE] || gl_info->supported[ARB_FRAGMENT_PROGRAM]) + { + idx = getFmtIdx(WINED3DFMT_P8_UINT); + gl_info->gl_formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); + } if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 091e85d..cc0aca0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1169,7 +1169,7 @@ struct blit_shader HRESULT (*set_shader)(IWineD3DDevice *iface, const struct GlPixelFormatDesc *format_desc, GLenum textype, UINT width, UINT height); void (*unset_shader)(IWineD3DDevice *iface); - BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); + BOOL (*color_fixup_supported)(const struct wined3d_gl_info *gl_info, struct color_fixup_desc fixup); }; extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN;

1 0

Roderick Colenbrander : wined3d: Get rid of d3dfmt_get_conv in RealizePalette.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: fb8812db8945c23eeb6655cc94f6c36d7d15d05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb8812db8945c23eeb6655cc9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 18 23:59:02 2010 +0100 wined3d: Get rid of d3dfmt_get_conv in RealizePalette. --- dlls/wined3d/surface.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index de19c48..bdc7b1f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4355,19 +4355,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) if (This->resource.format_desc->format == WINED3DFMT_P8_UINT || This->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM) { - int bpp; - GLenum format, internal, type; - CONVERT_TYPES convert; - - /* Check if we are using a RTL mode which uses texturing for uploads */ - BOOL use_texture = (wined3d_settings.rendertargetlock_mode == RTL_READTEX); - - /* Check if we have hardware palette conversion if we have convert is set to NO_CONVERSION */ - d3dfmt_get_conv(This, TRUE, use_texture, &format, &internal, &type, &convert, &bpp, FALSE); - - if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && (convert == NO_CONVERSION)) + IWineD3DDeviceImpl *device = This->resource.device; + if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && + device->blitter->color_fixup_supported(&device->adapter->gl_info, This->resource.format_desc->color_fixup)) { - IWineD3DDeviceImpl *device = This->resource.device; struct wined3d_context *context; /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ @@ -4378,7 +4369,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) /* Re-upload the palette */ context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); - d3dfmt_p8_upload_palette(iface, context->gl_info, convert); + d3dfmt_p8_upload_palette(iface, context->gl_info, NO_CONVERSION); context_release(context); } else { if(!(This->Flags & SFLAG_INSYSMEM)) {

1 0

Jörg Höhle : midimap: Allow GetVolume by device identifier.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 104cc7c28e8cf7d75596f0c55ef056b6278fa6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=104cc7c28e8cf7d75596f0c55… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 20 12:54:48 2010 +0100 midimap: Allow GetVolume by device identifier. --- dlls/midimap/midimap.c | 1 - dlls/winmm/tests/midi.c | 5 +++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 833c2f7..0c54d45 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -446,7 +446,6 @@ static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwPar static DWORD modGetVolume(MIDIMAPDATA* mom, DWORD* lpdwVolume) { - if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if (!lpdwVolume) return MMSYSERR_INVALPARAM; *lpdwVolume = 0xFFFFFFFF; /* tests show this initial value */ return MMSYSERR_NOERROR; diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 7ce402d..e531d04 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -230,6 +230,11 @@ static void test_midiOut_device(UINT udev, HWND hwnd) * real devices with the volume GUI SW-synth settings. */ if (!rc) trace("Current volume %x on device %d\n", ovolume, udev); + /* The W95 ESFM Synthesis device reports NOTENABLED although + * GetVolume by handle works and music plays. */ + rc = midiOutGetVolume((HMIDIOUT)udev, &ovolume); + ok((capsA.dwSupport & MIDICAPS_VOLUME) ? rc==MMSYSERR_NOERROR || broken(rc==MMSYSERR_NOTENABLED) : rc==MMSYSERR_NOTSUPPORTED, "midiOutGetVolume(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + /* Tests with midiOutSetvolume show that the midi mapper forwards * the value to the real device, but Get initially always reports * FFFFFFFF. Therefore, a Get+SetVolume pair with the mapper is

1 0