February 2011 - Wine-Commits

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

Feb. 1, 2011

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 Feb. 1, 2011

Feb. 1, 2011

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

Stefan Dösinger : d3d9: Use a proper window class in the device tests.
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

Module: wine Branch: master Commit: d9591d69f40d77935c65b26f552fa107f9361936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9591d69f40d77935c65b26f5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 30 20:50:11 2011 +0100 d3d9: Use a proper window class in the device tests. --- dlls/d3d9/tests/device.c | 50 ++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 41d1446..531d085 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -166,7 +166,7 @@ static void test_mipmap_levels(void) pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -213,7 +213,7 @@ static void test_checkdevicemultisampletype(void) pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -275,7 +275,7 @@ static void test_swapchain(void) pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -460,7 +460,7 @@ static void test_refcount(void) pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -773,7 +773,7 @@ static void test_cursor(void) pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -866,7 +866,7 @@ static void test_reset(void) pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -1332,7 +1332,7 @@ static void test_scene(void) pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -1489,7 +1489,7 @@ static void test_limits(void) pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -1561,7 +1561,7 @@ static void test_depthstenciltest(void) pD3d = pDirect3DCreate9( D3D_SDK_VERSION ); ok(pD3d != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; @@ -1740,7 +1740,7 @@ static void test_draw_indexed(void) HWND hwnd; void *ptr; - hwnd = CreateWindow("static", "d3d9_test", + hwnd = CreateWindow("d3d9_test_wc", "d3d9_test", 0, 0, 0, 10, 10, 0, 0, 0, 0); if (!hwnd) { @@ -1862,7 +1862,7 @@ static void test_null_stream(void) d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!d3d9 || !hwnd) goto cleanup; @@ -1946,7 +1946,7 @@ static void test_lights(void) d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!d3d9 || !hwnd) goto cleanup; @@ -2011,7 +2011,7 @@ static void test_set_stream_source(void) d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); - hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + hwnd = CreateWindow( "d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); ok(hwnd != NULL, "Failed to create window\n"); if (!d3d9 || !hwnd) goto cleanup; @@ -2227,14 +2227,9 @@ static void test_scissor_size(void) IDirect3DDevice9 *device_ptr = 0; D3DPRESENT_PARAMETERS present_parameters; HRESULT hr; - WNDCLASS wc = {0}; HWND hwnd = 0; RECT scissorrect; - wc.lpfnWndProc = DefWindowProc; - wc.lpszClassName = "d3d9_test_wc"; - RegisterClass(&wc); - hwnd = CreateWindow("d3d9_test_wc", "d3d9_test", WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, scts[i].winx, scts[i].winy, 0, 0, 0, 0); @@ -2309,7 +2304,7 @@ static void test_multi_device(void) ok(d3d9 != NULL, "Failed to create a d3d9 object.\n"); if (!d3d9) goto fail; - hwnd1 = CreateWindow("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + hwnd1 = CreateWindow("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); ok(hwnd1 != NULL, "Failed to create a window.\n"); if (!hwnd1) goto fail; @@ -2331,7 +2326,7 @@ static void test_multi_device(void) ok(d3d9 != NULL, "Failed to create a d3d9 object.\n"); if (!d3d9) goto fail; - hwnd2 = CreateWindow("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + hwnd2 = CreateWindow("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); ok(hwnd2 != NULL, "Failed to create a window.\n"); if (!hwnd2) goto fail; @@ -2835,7 +2830,7 @@ static void test_fpu_setup(void) ok(!!d3d9, "Failed to create a d3d9 object.\n"); if (!d3d9) return; - window = CreateWindowA("static", "d3d9_test", WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_CAPTION, 0, 0, 640, 480, 0, 0, 0, 0); ok(!!window, "Failed to create a window.\n"); if (!window) goto done; @@ -2887,10 +2882,16 @@ done: START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); + WNDCLASS wc = {0}; + + wc.lpfnWndProc = DefWindowProc; + wc.lpszClassName = "d3d9_test_wc"; + RegisterClass(&wc); + if (!d3d9_handle) { skip("Could not load d3d9.dll\n"); - return; + goto out; } pDirect3DCreate9 = (void *)GetProcAddress( d3d9_handle, "Direct3DCreate9" ); @@ -2901,7 +2902,7 @@ START_TEST(device) if(!d3d9) { skip("could not create D3D9 object\n"); - return; + goto out; } IDirect3D9_Release(d3d9); @@ -2926,4 +2927,7 @@ START_TEST(device) test_wndproc(); test_wndproc_windowed(); } + +out: + UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : wined3d: Pass a const adapter to the format caps checking functions.
by Alexandre Julliard Feb. 1, 2011

Feb. 1, 2011

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