March 2016 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Avoid storing a rectangle pointer in struct wined3d_cs_set_scissor_rect.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 8d8b4d9c66720228b57ec62b6489049ad6c11b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8b4d9c66720228b57ec62b6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 22 17:46:13 2016 +0100 wined3d: Avoid storing a rectangle pointer in struct wined3d_cs_set_scissor_rect. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e36429d..6e7a57b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -101,7 +101,7 @@ struct wined3d_cs_set_viewport struct wined3d_cs_set_scissor_rect { enum wined3d_cs_op opcode; - const RECT *rect; + RECT rect; }; struct wined3d_cs_set_rendertarget_view @@ -374,7 +374,7 @@ static void wined3d_cs_exec_set_scissor_rect(struct wined3d_cs *cs, const void * { const struct wined3d_cs_set_scissor_rect *op = data; - cs->state.scissor_rect = *op->rect; + cs->state.scissor_rect = op->rect; device_invalidate_state(cs->device, STATE_SCISSORRECT); } @@ -384,7 +384,7 @@ void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) op = cs->ops->require_space(cs, sizeof(*op)); op->opcode = WINED3D_CS_OP_SET_SCISSOR_RECT; - op->rect = rect; + op->rect = *rect; cs->ops->submit(cs); }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_blt_special().
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: 6d823825faeeab73dea821c24060d3fd8ff5c817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d823825faeeab73dea821c24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 22 17:46:11 2016 +0100 wined3d: Get resource info from the texture in surface_blt_special(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4243de6..9840683 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2621,35 +2621,39 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { - struct wined3d_device *device = dst_surface->resource.device; + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_device *device = dst_texture->resource.device; const struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(device->fb.render_targets[0]); struct wined3d_swapchain *src_swapchain, *dst_swapchain; + struct wined3d_texture *src_texture; TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); /* Get the swapchain. One of the surfaces has to be a primary surface */ - if (dst_surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) + if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) { WARN("Destination is in sysmem, rejecting gl blt\n"); return WINED3DERR_INVALIDCALL; } - dst_swapchain = dst_surface->container->swapchain; + dst_swapchain = dst_texture->swapchain; if (src_surface) { - if (src_surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) + src_texture = src_surface->container; + if (src_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) { WARN("Src is in sysmem, rejecting gl blt\n"); return WINED3DERR_INVALIDCALL; } - src_swapchain = src_surface->container->swapchain; + src_swapchain = src_texture->swapchain; } else { + src_texture = NULL; src_swapchain = NULL; } @@ -2698,8 +2702,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE BOOL stretchx; /* P8 read back is not implemented */ - if (src_surface->resource.format->id == WINED3DFMT_P8_UINT - || dst_surface->resource.format->id == WINED3DFMT_P8_UINT) + if (src_texture->resource.format->id == WINED3DFMT_P8_UINT + || dst_texture->resource.format->id == WINED3DFMT_P8_UINT) { TRACE("P8 read back not supported by frame buffer to texture blit\n"); return WINED3DERR_INVALIDCALL;

1 0

Francois Gouget : d3dx9_36: Make d3dx_set_shader_const_state() static.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: wine Branch: master Commit: f030fbe0a29a0f6a6756ebc579172c1e83f9d58a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f030fbe0a29a0f6a6756ebc57… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 22 11:24:44 2016 +0100 d3dx9_36: Make d3dx_set_shader_const_state() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8f82784..a210bb3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2645,7 +2645,7 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma } } -HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTANT_TYPE op, UINT index, +static HRESULT d3dx_set_shader_const_state(IDirect3DDevice9 *device, enum SHADER_CONSTANT_TYPE op, UINT index, struct d3dx_parameter *param, void *value_ptr) { static const struct

1 0

Francois Gouget : testbot/TestAgent: Clearly identify all the 'out of eval ' return calls.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: tools Branch: master Commit: 8a64b64f5a3ed581468096633c355b0eba4382f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8a64b64f5a3ed58146809663… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 23 11:48:52 2016 +0100 testbot/TestAgent: Clearly identify all the 'out of eval' return calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index a87b3f2..f255e0f 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -266,13 +266,13 @@ sub _RecvRawData($$$) { alarm(0); $self->_SetError($FATAL, "network read error ($self->{rpc}:$Name:$Received/$Size): $!"); - return; + return; # out of eval } if ($r == 0) { alarm(0); $self->_SetError($FATAL, "network read got a premature EOF ($self->{rpc}:$Name:$Received/$Size)"); - return; + return; # out of eval } $Data .= $Buffer; $Received += $r; @@ -310,13 +310,13 @@ sub _SkipRawData($$) { alarm(0); $self->_SetError($FATAL, "network skip failed ($self->{rpc}:$Name:$Received/$Size): $!"); - return; + return; # out of eval } if ($n == 0) { alarm(0); $self->_SetError($FATAL, "network skip got a premature EOF ($self->{rpc}:$Name:$Received/$Size)"); - return; + return; # out of eval } $Received += $n; $Remaining -= $n; @@ -481,13 +481,13 @@ sub _RecvFile($$$$) { alarm(0); $self->_SetError($FATAL, "got a network error while receiving '$Filename' ($self->{rpc}:$Name:$Received/$Size): $!"); - return; + return; # out of eval } if ($r == 0) { alarm(0); $self->_SetError($FATAL, "got a premature EOF while receiving '$Filename' ($self->{rpc}:$Name:$Received/$Size)"); - return; + return; # out of eval } $Remaining -= $r; my $w = syswrite($Dst, $Buffer, $r, 0); @@ -497,7 +497,7 @@ sub _RecvFile($$$$) alarm(0); $self->_SetError($ERROR, "an error occurred while writing to '$Filename' ($self->{rpc}:$Name:$Received/$Size): $!"); $self->_SkipRawData($Name, $Remaining); - return; + return; # out of eval } } alarm(0); @@ -795,13 +795,13 @@ sub _SendFile($$$$) { alarm(0); $self->_SetError($FATAL, "an error occurred while reading from '$Filename' ($self->{rpc}:$Name:$Sent/$Size): $!"); - return; + return; # out of eval } if ($r == 0) { alarm(0); $self->_SetError($FATAL, "got a premature EOF while reading from '$Filename' ($self->{rpc}:$Name:$Sent/$Size)"); - return; + return; # out of eval } $Remaining -= $r; my $w = $self->_Write($Name, $Buffer); @@ -810,7 +810,7 @@ sub _SendFile($$$$) { alarm(0); $self->_SetError($FATAL, "got a network error while sending '$Filename' ($self->{rpc}:$Name:$Sent+$s/$Size): $!"); - return; + return; # out of eval } } alarm(0);

1 0

Francois Gouget : testbot/TestAgent: Prevent _SendEntryHeader() from interfering with _SendFile()'s timeout mechanism.
by Alexandre Julliard March 23, 2016

March 23, 2016

Module: tools Branch: master Commit: 2ebf75b9c5dc489974e7119fccd6b403e566cc5f URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ebf75b9c5dc489974e7119f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 23 11:48:29 2016 +0100 testbot/TestAgent: Prevent _SendEntryHeader() from interfering with _SendFile()'s timeout mechanism. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 1b2916f..a87b3f2 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -777,6 +777,8 @@ sub _SendFile($$$$) debug(" SendFile('$Name', '$Filename')\n"); my $Size = -s $Filename; + return undef if (!$self->_SendEntryHeader("$Name/Size", 'd', $Size)); + my ($Start, $Sent, $Remaining) = (now(), 0, $Size); my $Success; eval @@ -784,7 +786,6 @@ sub _SendFile($$$$) local $SIG{ALRM} = sub { die "timeout" }; $self->_SetAlarm(); - return if (!$self->_SendEntryHeader("$Name/Size", 'd', $Size)); while ($Remaining) { my $Buffer;

1 0

Jeremy Newman : set plural
by Jeremy Newman March 22, 2016

March 22, 2016

Module: appdb Branch: master Commit: 779db21a87786cb2840226015bfdfeecb7f51399 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=779db21a87786cb284022601… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Mar 22 15:26:46 2016 -0500 set plural --- include/screenshot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index adb0658..692da89 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -534,12 +534,12 @@ class screenshot $sZoomIcon = Screenshot::get_zoomicon_overlay(); /* we have screenshots */ - if($hResult && query_num_rows($hResult)) + if($hResult && $numShots = query_num_rows($hResult)) { if($iVersionId) $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>View/Submit Screenshot</a></div>"; else - $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>View Screenshot</a></div>"; + $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>View Screenshot".($numShots > 1 ? "s" : "")."</a></div>"; } else if($iVersionId) /* we are asking for a specific app version but it has no screenshots */ { $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>Submit Screenshot</a></div>";

1 0

Jeremy Newman : imagejpeg second param should be null to output directly
by Jeremy Newman March 22, 2016

March 22, 2016

Module: appdb Branch: master Commit: f69dfc770c66885f95ae8c6e7b7de30ccdc18638 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f69dfc770c66885f95ae8c6e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Mar 22 13:43:09 2016 -0500 imagejpeg second param should be null to output directly --- include/image.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/image.php b/include/image.php index 16e45dc..6f22aad 100644 --- a/include/image.php +++ b/include/image.php @@ -360,7 +360,7 @@ class Image { case 2: if($bHeader) header('Content-type: image/jpeg'); - imagejpeg($this->oImage,'',$iQuality); + imagejpeg($this->oImage,null,$iQuality); $this->set_debuglog("Outputed file as jpeg to browser"); break;

1 0

Józef Kucia : wined3d: Fix driver version check.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: 97c70c86be26e02a398411877d6e6a26367d3ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c70c86be26e02a398411877… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:46 2016 +0100 wined3d: Fix driver version check. The previous check didn't catch older Windows versions for which dwMinorVersion > 2. Spotted by Michael Müller. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index be3fdb0..f57f326 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1533,8 +1533,7 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * In order to avoid this application bug we limit the amount of video memory * to LONG_MAX for older Windows versions. */ - if (os_version.dwMajorVersion <= 5 && os_version.dwMinorVersion <= 2 - && driver_info->vram_bytes > LONG_MAX) + if (driver_model < DRIVER_MODEL_NT6X && driver_info->vram_bytes > LONG_MAX) { TRACE("Limiting amount of video memory to %#lx bytes for OS version older than Vista.\n", LONG_MAX); driver_info->vram_bytes = LONG_MAX;

1 0

Józef Kucia : d3d11/tests: Test render to depth texture.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: 329dfee70c35184329d0820a5e9edbbed8b49b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329dfee70c35184329d0820a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:50 2016 +0100 d3d11/tests: Test render to depth texture. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 188 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 178 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 819c547..4953675 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4139,20 +4139,13 @@ static void test_scissor(void) return float4(0.0, 1.0, 0.0, 1.0); } #endif - 0x43425844, 0xe70802a0, 0xee334047, 0x7bfd0c79, 0xaeff7804, 0x00000001, 0x000001b0, 0x00000005, - 0x00000034, 0x0000008c, 0x000000c0, 0x000000f4, 0x00000134, 0x46454452, 0x00000050, 0x00000000, - 0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, - 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e30332e, - 0x30303239, 0x3336312e, 0xab003438, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, - 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x54415453, 0x00000074, 0x00000002, - 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, }; if (!init_test_context(&test_context, NULL)) @@ -5362,6 +5355,180 @@ static void test_clear_depth_stencil_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_draw_depth_only(void) +{ + ID3D11DepthStencilState *depth_stencil_state; + D3D11_DEPTH_STENCIL_DESC depth_stencil_desc; + struct d3d11_test_context test_context; + ID3D11PixelShader *ps_color, *ps_depth; + D3D11_TEXTURE2D_DESC texture_desc; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + struct texture_readback rb; + ID3D11Texture2D *texture; + ID3D11Device *device; + unsigned int i, j; + D3D11_VIEWPORT vp; + struct vec4 depth; + ID3D11Buffer *cb; + HRESULT hr; + + static const DWORD ps_color_code[] = + { +#if 0 + float4 main(float4 position : SV_POSITION) : SV_Target + { + return float4(0.0, 1.0, 0.0, 1.0); + } +#endif + 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const DWORD ps_depth_code[] = + { +#if 0 + float depth; + + float main() : SV_Depth + { + return depth; + } +#endif + 0x43425844, 0x91af6cd0, 0x7e884502, 0xcede4f54, 0x6f2c9326, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, + 0x00000e01, 0x445f5653, 0x68747065, 0xababab00, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x02000065, 0x0000c001, 0x05000036, 0x0000c001, + 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + buffer_desc.ByteWidth = sizeof(depth); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + depth_stencil_desc.DepthEnable = TRUE; + depth_stencil_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; + depth_stencil_desc.DepthFunc = D3D11_COMPARISON_LESS; + depth_stencil_desc.StencilEnable = FALSE; + + hr = ID3D11Device_CreateDepthStencilState(device, &depth_stencil_desc, &depth_stencil_state); + ok(SUCCEEDED(hr), "Failed to create depth stencil state, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_color_code, sizeof(ps_color_code), NULL, &ps_color); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_depth_code, sizeof(ps_depth_code), NULL, &ps_depth); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + ID3D11DeviceContext_PSSetShader(context, ps_color, NULL, 0); + ID3D11DeviceContext_OMSetRenderTargets(context, 0, NULL, dsv); + ID3D11DeviceContext_OMSetDepthStencilState(context, depth_stencil_state, 0); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + check_texture_float(texture, 1.0f, 1); + draw_quad(&test_context); + check_texture_float(texture, 0.0f, 1); + + ID3D11DeviceContext_PSSetShader(context, ps_depth, NULL, 0); + + depth.x = 0.7f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.0f, 1); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + check_texture_float(texture, 1.0f, 1); + draw_quad(&test_context); + check_texture_float(texture, 0.7f, 1); + depth.x = 0.8f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.7f, 1); + depth.x = 0.5f; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.5f, 1); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + depth.x = 0.1f; + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + depth.x = 1.0f / 16.0f * (j + 4 * i); + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &depth, 0, 0); + + vp.TopLeftX = 160.0f * j; + vp.TopLeftY = 120.0f * i; + vp.Width = 160.0f; + vp.Height = 120.0f; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + + draw_quad(&test_context); + } + } + get_texture_readback(texture, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + float obtained_depth, expected_depth; + + obtained_depth = get_readback_float(&rb, 80 + j * 160, 60 + i * 120); + expected_depth = 1.0f / 16.0f * (j + 4 * i); + ok(compare_float(obtained_depth, expected_depth, 1), + "Got unexpected depth %.8e at (%u, %u), expected %.8e.\n", + obtained_depth, j, i, expected_depth); + } + } + release_texture_readback(&rb); + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps_color); + ID3D11PixelShader_Release(ps_depth); + ID3D11DepthStencilView_Release(dsv); + ID3D11DepthStencilState_Release(depth_stencil_state); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_cb_relative_addressing(void) { struct d3d11_test_context test_context; @@ -5594,5 +5761,6 @@ START_TEST(d3d11) test_multisample_init(); test_check_multisample_quality_levels(); test_clear_depth_stencil_view(); + test_draw_depth_only(); test_cb_relative_addressing(); }

1 0

Józef Kucia : d3d10core/tests: Test render to depth texture.
by Alexandre Julliard March 22, 2016

March 22, 2016

Module: wine Branch: master Commit: 4037b48a4cb9cf18ed0f978d8ad43d1ed55ba2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4037b48a4cb9cf18ed0f978d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 22 13:41:49 2016 +0100 d3d10core/tests: Test render to depth texture. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 195 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 181 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a402d60..4c41d25 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2348,24 +2348,19 @@ static void test_scissor(void) static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; static const DWORD ps_code[] = { - /* float4 main(float4 position : SV_POSITION) : SV_Target - * { - * return float4(0.0, 1.0, 0.0, 1.0); - * } */ - 0x43425844, 0xe70802a0, 0xee334047, 0x7bfd0c79, 0xaeff7804, 0x00000001, 0x000001b0, 0x00000005, - 0x00000034, 0x0000008c, 0x000000c0, 0x000000f4, 0x00000134, 0x46454452, 0x00000050, 0x00000000, - 0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, 0x0000001c, 0x7263694d, 0x666f736f, - 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, 0x39207265, 0x2e30332e, - 0x30303239, 0x3336312e, 0xab003438, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, +#if 0 + float4 main(float4 position : SV_POSITION) : SV_Target + { + return float4(0.0, 1.0, 0.0, 1.0); + } +#endif + 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, - 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x54415453, 0x00000074, 0x00000002, - 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, }; if (!init_test_context(&test_context)) @@ -5936,6 +5931,177 @@ static void test_clear_depth_stencil_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_draw_depth_only(void) +{ + ID3D10DepthStencilState *depth_stencil_state; + D3D10_DEPTH_STENCIL_DESC depth_stencil_desc; + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps_color, *ps_depth; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_BUFFER_DESC buffer_desc; + ID3D10DepthStencilView *dsv; + struct texture_readback rb; + ID3D10Texture2D *texture; + ID3D10Device *device; + unsigned int i, j; + D3D10_VIEWPORT vp; + struct vec4 depth; + ID3D10Buffer *cb; + HRESULT hr; + + static const DWORD ps_color_code[] = + { +#if 0 + float4 main(float4 position : SV_POSITION) : SV_Target + { + return float4(0.0, 1.0, 0.0, 1.0); + } +#endif + 0x43425844, 0x30240e72, 0x012f250c, 0x8673c6ea, 0x392e4cec, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, + 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, + }; + static const DWORD ps_depth_code[] = + { +#if 0 + float depth; + + float main() : SV_Depth + { + return depth; + } +#endif + 0x43425844, 0x91af6cd0, 0x7e884502, 0xcede4f54, 0x6f2c9326, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0xffffffff, + 0x00000e01, 0x445f5653, 0x68747065, 0xababab00, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x02000065, 0x0000c001, 0x05000036, 0x0000c001, + 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + buffer_desc.ByteWidth = sizeof(depth); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + depth_stencil_desc.DepthEnable = TRUE; + depth_stencil_desc.DepthWriteMask = D3D10_DEPTH_WRITE_MASK_ALL; + depth_stencil_desc.DepthFunc = D3D10_COMPARISON_LESS; + depth_stencil_desc.StencilEnable = FALSE; + + hr = ID3D10Device_CreateDepthStencilState(device, &depth_stencil_desc, &depth_stencil_state); + ok(SUCCEEDED(hr), "Failed to create depth stencil state, hr %#x.\n", hr); + + hr = ID3D10Device_CreatePixelShader(device, ps_color_code, sizeof(ps_color_code), &ps_color); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_depth_code, sizeof(ps_depth_code), &ps_depth); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + ID3D10Device_PSSetShader(device, ps_color); + ID3D10Device_OMSetRenderTargets(device, 0, NULL, dsv); + ID3D10Device_OMSetDepthStencilState(device, depth_stencil_state, 0); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + check_texture_float(texture, 1.0f, 1); + draw_quad(&test_context); + check_texture_float(texture, 0.0f, 1); + + ID3D10Device_PSSetShader(device, ps_depth); + + depth.x = 0.7f; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.0f, 1); + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + check_texture_float(texture, 1.0f, 1); + draw_quad(&test_context); + check_texture_float(texture, 0.7f, 1); + depth.x = 0.8f; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.7f, 1); + depth.x = 0.5f; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &depth, 0, 0); + draw_quad(&test_context); + check_texture_float(texture, 0.5f, 1); + + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + depth.x = 0.1f; + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + depth.x = 1.0f / 16.0f * (j + 4 * i); + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &depth, 0, 0); + + vp.TopLeftX = 160 * j; + vp.TopLeftY = 120 * i; + vp.Width = 160; + vp.Height = 120; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D10Device_RSSetViewports(device, 1, &vp); + + draw_quad(&test_context); + } + } + get_texture_readback(texture, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + float obtained_depth, expected_depth; + + obtained_depth = get_readback_float(&rb, 80 + j * 160, 60 + i * 120); + expected_depth = 1.0f / 16.0f * (j + 4 * i); + ok(compare_float(obtained_depth, expected_depth, 1), + "Got unexpected depth %.8e at (%u, %u), expected %.8e.\n", + obtained_depth, j, i, expected_depth); + } + } + release_texture_readback(&rb); + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps_color); + ID3D10PixelShader_Release(ps_depth); + ID3D10DepthStencilView_Release(dsv); + ID3D10DepthStencilState_Release(depth_stencil_state); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -5970,4 +6136,5 @@ START_TEST(device) test_cb_relative_addressing(); test_swapchain_flip(); test_clear_depth_stencil_view(); + test_draw_depth_only(); }

1 0