wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Henri Verbeet : wined3d: Pass a const adapter to the format caps checking functions.
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: ddb36691f6a70a0d72f170751becb3c6371b59a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb36691f6a70a0d72f170751… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 31 19:19:25 2011 +0100 wined3d: Pass a const adapter to the format caps checking functions. --- dlls/wined3d/directx.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b80da0..84fdc87 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3087,7 +3087,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceMultiSampleType(IWineD3D *iface, U } /* Check if we support bumpmapping for a format */ -static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, const struct wined3d_format *format) +static BOOL CheckBumpMapCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { /* Ask the fixed function pipeline implementation if it can deal * with the conversion. If we've got a GL extension giving native @@ -3097,7 +3097,7 @@ static BOOL CheckBumpMapCapability(struct wined3d_adapter *adapter, const struct } /* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ -static BOOL CheckDepthStencilCapability(struct wined3d_adapter *adapter, +static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *display_format, const struct wined3d_format *ds_format) { int it=0; @@ -3129,7 +3129,7 @@ static BOOL CheckDepthStencilCapability(struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckFilterCapability(struct wined3d_adapter *adapter, const struct wined3d_format *format) +static BOOL CheckFilterCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { /* The flags entry of a format contains the filtering capability */ if (format->flags & WINED3DFMT_FLAG_FILTERING) return TRUE; @@ -3138,7 +3138,7 @@ static BOOL CheckFilterCapability(struct wined3d_adapter *adapter, const struct } /* Check the render target capabilities of a format */ -static BOOL CheckRenderTargetCapability(struct wined3d_adapter *adapter, +static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *check_format) { /* Filter out non-RT formats */ @@ -3182,12 +3182,12 @@ static BOOL CheckRenderTargetCapability(struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckSrgbReadCapability(struct wined3d_adapter *adapter, const struct wined3d_format *format) +static BOOL CheckSrgbReadCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { return adapter->gl_info.supported[EXT_TEXTURE_SRGB] && (format->flags & WINED3DFMT_FLAG_SRGB_READ); } -static BOOL CheckSrgbWriteCapability(struct wined3d_adapter *adapter, const struct wined3d_format *format) +static BOOL CheckSrgbWriteCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { /* Only offer SRGB writing on X8R8G8B8/A8R8G8B8 when we use ARB or GLSL shaders as we are * doing the color fixup in shaders. @@ -3209,7 +3209,7 @@ static BOOL CheckSrgbWriteCapability(struct wined3d_adapter *adapter, const stru } /* Check if a format support blending in combination with pixel shaders */ -static BOOL CheckPostPixelShaderBlendingCapability(struct wined3d_adapter *adapter, +static BOOL CheckPostPixelShaderBlendingCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { /* The flags entry of a format contains the post pixel shader blending capability */ @@ -3218,7 +3218,7 @@ static BOOL CheckPostPixelShaderBlendingCapability(struct wined3d_adapter *adapt return FALSE; } -static BOOL CheckWrapAndMipCapability(struct wined3d_adapter *adapter, const struct wined3d_format *format) +static BOOL CheckWrapAndMipCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { /* OpenGL supports mipmapping on all formats basically. Wrapping is unsupported, * but we have to report mipmapping so we cannot reject this flag. Tests show that @@ -3233,7 +3233,7 @@ static BOOL CheckWrapAndMipCapability(struct wined3d_adapter *adapter, const str } /* Check if a texture format is supported on the given adapter */ -static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, const struct wined3d_format *format) +static BOOL CheckTextureCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { const struct wined3d_gl_info *gl_info = &adapter->gl_info; @@ -3489,7 +3489,7 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, const struct return FALSE; } -static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, +static BOOL CheckSurfaceCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *adapter_format, const struct wined3d_format *check_format, WINED3DSURFTYPE SurfaceType) @@ -3543,7 +3543,7 @@ static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, return FALSE; } -static BOOL CheckVertexTextureCapability(struct wined3d_adapter *adapter, +static BOOL CheckVertexTextureCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { return adapter->gl_info.limits.vertex_samplers && (format->flags & WINED3DFMT_FLAG_VTF); @@ -3554,7 +3554,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt enum wined3d_format_id CheckFormat, WINED3DSURFTYPE SurfaceType) { IWineD3DImpl *This = (IWineD3DImpl *)iface; - struct wined3d_adapter *adapter = &This->adapters[Adapter]; + const struct wined3d_adapter *adapter = &This->adapters[Adapter]; const struct wined3d_gl_info *gl_info = &adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, CheckFormat); const struct wined3d_format *adapter_format = wined3d_get_format(gl_info, AdapterFormat);

1 0

Henri Verbeet : wined3d: Just fail if the texture type is not supported in create_glsl_blt_shader() (LLVM/Clang).
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 4c30b82c83744c286c0406eaf0464018b9bb9abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c30b82c83744c286c0406eaf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 31 19:19:24 2011 +0100 wined3d: Just fail if the texture type is not supported in create_glsl_blt_shader() (LLVM/Clang). Changing the texture type has no effect at this point, and it wouldn't work properly anyway. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e8bb553..e349e26 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4563,7 +4563,7 @@ static GLhandleARB create_glsl_blt_shader(const struct wined3d_gl_info *gl_info, if (!blt_pshader) { FIXME("tex_type %#x not supported\n", tex_type); - tex_type = tex_2d; + return 0; } vshader_id = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB));

1 0

Henri Verbeet : d3d9/tests: Check ColorFill() return codes in color_fill_test() (LLVM/Clang).
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: 4125fa62b94081f43db1fad64a5367aa032687c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4125fa62b94081f43db1fad64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 31 19:19:23 2011 +0100 d3d9/tests: Check ColorFill() return codes in color_fill_test() (LLVM/Clang). --- dlls/d3d9/tests/visual.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d01252d..d73e603 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -654,6 +654,7 @@ static void color_fill_test(IDirect3DDevice9 *device) { fill_color = 0x112233; hr = IDirect3DDevice9_ColorFill(device, backbuffer, NULL, fill_color); + ok(SUCCEEDED(hr), "Color fill failed, hr %#x.\n", hr); color = getPixelColor(device, 0, 0); ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); @@ -668,6 +669,7 @@ static void color_fill_test(IDirect3DDevice9 *device) { fill_color = 0x445566; hr = IDirect3DDevice9_ColorFill(device, rt_surface, NULL, fill_color); + ok(SUCCEEDED(hr), "Color fill failed, hr %#x.\n", hr); color = getPixelColorFromSurface(rt_surface, 0, 0); ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); @@ -683,6 +685,7 @@ static void color_fill_test(IDirect3DDevice9 *device) { fill_color = 0x778899; hr = IDirect3DDevice9_ColorFill(device, offscreen_surface, NULL, fill_color); + ok(SUCCEEDED(hr), "Color fill failed, hr %#x.\n", hr); color = getPixelColorFromSurface(offscreen_surface, 0, 0); ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color);

1 0

Henri Verbeet : d3d8/tests: Release doesn't return a HRESULT (LLVM/Clang).
by Alexandre Julliard 01 Feb '11

01 Feb '11

Module: wine Branch: master Commit: ebf66c1061fe8f12604dc0842a2d609c7819637b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf66c1061fe8f12604dc0842… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 31 19:19:22 2011 +0100 d3d8/tests: Release doesn't return a HRESULT (LLVM/Clang). --- dlls/d3d8/tests/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 33cc56d..fa7d268 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -1820,7 +1820,7 @@ static void resource_test_cleanup(IDirect3DDevice8 *device, struct state_test *t for (i = 0; i < arg->tex_count; ++i) { - hr = IDirect3DBaseTexture8_Release(ctx->test_data_all.tex[i]); + IDirect3DBaseTexture8_Release(ctx->test_data_all.tex[i]); } HeapFree(GetProcessHeap(), 0, ctx->default_data.vb);

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 February 2011