April 2016 - Wine-commits - list.winehq.org

Paul Gofman : d3dx9: Add test for D3DXPlaneFromPointNormal arguments aliasing.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 97bbf747c0a2400c49ef053d79b74733aab1e66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bbf747c0a2400c49ef053d7… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 15:10:11 2016 +0300 d3dx9: Add test for D3DXPlaneFromPointNormal arguments aliasing. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 0fe6796..4ac0a31 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -609,7 +609,14 @@ static void D3DXPlaneTest(void) vec1.x = 11.0f; vec1.y = 13.0f; vec1.z = 15.0f; vec2.x = 17.0f; vec2.y = 31.0f; vec2.z = 24.0f; expectedplane.a = 17.0f; expectedplane.b = 31.0f; expectedplane.c = 24.0f; expectedplane.d = -950.0f; - D3DXPlaneFromPointNormal(&gotplane,&vec1,&vec2); + D3DXPlaneFromPointNormal(&gotplane, &vec1, &vec2); + expect_plane(expectedplane, gotplane); + gotplane.a = vec2.x; gotplane.b = vec2.y; gotplane.c = vec2.z; + D3DXPlaneFromPointNormal(&gotplane, &vec1, (D3DXVECTOR3 *)&gotplane); + expect_plane(expectedplane, gotplane); + gotplane.a = vec1.x; gotplane.b = vec1.y; gotplane.c = vec1.z; + expectedplane.d = -1826.0f; + D3DXPlaneFromPointNormal(&gotplane, (D3DXVECTOR3 *)&gotplane, &vec2); expect_plane(expectedplane, gotplane); /*_______________D3DXPlaneFromPoints_______*/

1 0

Paul Gofman : d3dx9: Get rid of redundant temporary variable in D3DXQuaternionInverse.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: a67b43c1bed7aa5b2df0529d2358bd1752cc18a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67b43c1bed7aa5b2df0529d2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 15:10:12 2016 +0300 d3dx9: Get rid of redundant temporary variable in D3DXQuaternionInverse. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 394ff05..1808782 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1376,19 +1376,16 @@ D3DXQUATERNION * WINAPI D3DXQuaternionExp(D3DXQUATERNION *out, const D3DXQUATERN D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, const D3DXQUATERNION *pq) { - D3DXQUATERNION out; FLOAT norm; TRACE("pout %p, pq %p\n", pout, pq); norm = D3DXQuaternionLengthSq(pq); - out.x = -pq->x / norm; - out.y = -pq->y / norm; - out.z = -pq->z / norm; - out.w = pq->w / norm; - - *pout =out; + pout->x = -pq->x / norm; + pout->y = -pq->y / norm; + pout->z = -pq->z / norm; + pout->w = pq->w / norm; return pout; }

1 0

Paul Gofman : d3dx9: D3DXVec2Transform should support arguments aliasing.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: bb9a2e6714668398e01ac045978f37a8ee490eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9a2e6714668398e01ac0459… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 15:10:14 2016 +0300 d3dx9: D3DXVec2Transform should support arguments aliasing. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 11 +++++++---- dlls/d3dx9_36/tests/math.c | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 1808782..641bece 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1712,12 +1712,15 @@ D3DXVECTOR2* WINAPI D3DXVec2Normalize(D3DXVECTOR2 *pout, const D3DXVECTOR2 *pv) D3DXVECTOR4* WINAPI D3DXVec2Transform(D3DXVECTOR4 *pout, const D3DXVECTOR2 *pv, const D3DXMATRIX *pm) { + D3DXVECTOR4 out; + TRACE("pout %p, pv %p, pm %p\n", pout, pv, pm); - pout->x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[3][0]; - pout->y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[3][1]; - pout->z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[3][2]; - pout->w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[3][3]; + out.x = pm->u.m[0][0] * pv->x + pm->u.m[1][0] * pv->y + pm->u.m[3][0]; + out.y = pm->u.m[0][1] * pv->x + pm->u.m[1][1] * pv->y + pm->u.m[3][1]; + out.z = pm->u.m[0][2] * pv->x + pm->u.m[1][2] * pv->y + pm->u.m[3][2]; + out.w = pm->u.m[0][3] * pv->x + pm->u.m[1][3] * pv->y + pm->u.m[3][3]; + *pout = out; return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 4ac0a31..46f90dd 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1186,8 +1186,11 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Transform_______________________*/ expectedtrans.x = 36.0f; expectedtrans.y = 44.0f; expectedtrans.z = 52.0f; expectedtrans.w = 60.0f; - D3DXVec2Transform(&gottrans,&u,&mat); - expect_vec4(expectedtrans,gottrans); + D3DXVec2Transform(&gottrans, &u, &mat); + expect_vec4(expectedtrans, gottrans); + gottrans.x = u.x; gottrans.y = u.y; + D3DXVec2Transform(&gottrans, (D3DXVECTOR2 *)&gottrans, &mat); + expect_vec4(expectedtrans, gottrans); /*_______________D3DXVec2TransformCoord_______________________*/ expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f;

1 0

Paul Gofman : d3dx9: Add test for D3DXVec2TransformCoord arguments aliasing.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 61b09f3fc78d291a5d37f7006bc28f8674992458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b09f3fc78d291a5d37f7006… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 14 15:10:15 2016 +0300 d3dx9: Add test for D3DXVec2TransformCoord arguments aliasing. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 46f90dd..a1b622b 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1194,8 +1194,11 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2TransformCoord_______________________*/ expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f; - D3DXVec2TransformCoord(&gotvec,&u,&mat); - expect_vec(expectedvec,gotvec); + D3DXVec2TransformCoord(&gotvec, &u, &mat); + expect_vec(expectedvec, gotvec); + gotvec.x = u.x; gotvec.y = u.y; + D3DXVec2TransformCoord(&gotvec, (D3DXVECTOR2 *)&gotvec, &mat); + expect_vec(expectedvec, gotvec); /*_______________D3DXVec2TransformNormal______________________*/ expectedvec.x = 23.0f; expectedvec.y = 30.0f;

1 0

Francois Gouget : d3dcompiler_43/tests: Fix a needless spelling error in a test.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 304bbbeaa7cdcc1b6b442dded4e3a8d64c60bfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=304bbbeaa7cdcc1b6b442dded… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 15 14:27:14 2016 +0200 d3dcompiler_43/tests: Fix a needless spelling error in a test. 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/d3dcompiler_43/tests/reflection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 70c062e..9d77d47 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -1296,7 +1296,7 @@ static void test_reflection_constant_buffer(void) ok(t11_valid != t11_dummy && t11_valid, "GetType failed\n"); /* reflection calls */ - cb11 = ref11->lpVtbl->GetConstantBufferByName(ref11, "invaild"); + cb11 = ref11->lpVtbl->GetConstantBufferByName(ref11, "invalid"); ok(cb11_dummy == cb11, "GetConstantBufferByName failed, got %p, expected %p\n", cb11, cb11_dummy); cb11 = ref11->lpVtbl->GetConstantBufferByName(ref11, NULL); @@ -1305,7 +1305,7 @@ static void test_reflection_constant_buffer(void) v11 = ref11->lpVtbl->GetVariableByName(ref11, NULL); ok(v11_dummy == v11, "GetVariableByIndex failed, got %p, expected %p\n", v11, v11_dummy); - v11 = ref11->lpVtbl->GetVariableByName(ref11, "invaild"); + v11 = ref11->lpVtbl->GetVariableByName(ref11, "invalid"); ok(v11_dummy == v11, "GetVariableByName failed, got %p, expected %p\n", v11, v11_dummy); v11 = ref11->lpVtbl->GetVariableByName(ref11, "a");

1 0

Francois Gouget : d3dxof/tests: Fix an unknown spelling error in the shader tests.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: 50215415f1969b9ef7319a3a685e6daa61f98209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50215415f1969b9ef7319a3a6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 17 20:05:38 2016 +0200 d3dxof/tests: Fix an unknown spelling error in the shader tests. 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/d3dxof/tests/d3dxof.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 0573e4a..29a3868 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -536,7 +536,7 @@ static void test_CreateEnumObject(void) ok(*((WORD*)pdata) == 3, "Retrieved data is wrong (%u instead of 3)\n", *((WORD*)pdata)); /* Try to get not existing member (szMember == "unknown") */ - hr = IDirectXFileData_GetData(lpdxfd, "unknow", &size, (void**)&pdata); + hr = IDirectXFileData_GetData(lpdxfd, "unknown", &size, (void**)&pdata); ok(hr == DXFILEERR_BADDATAREFERENCE, "IDirectXFileData_GetData: %x\n", hr); ref = IDirectXFileEnumObject_Release(lpdxfeo);

1 0

Francois Gouget : d3dx9_36/tests: Fix an unknown spelling error in the shader tests.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: a6745afc540d4a19d96ebf92c22262efe49fb8dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6745afc540d4a19d96ebf92c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 17 20:05:32 2016 +0200 d3dx9_36/tests: Fix an unknown spelling error in the shader tests. 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/tests/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 694540c..4a7ae67 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -554,7 +554,7 @@ static void test_get_shader_constant_table_ex(void) ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); hr = ID3DXConstantTable_GetConstantDesc(constant_table, constant, &constant_desc, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); - hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant unknow", &constant_desc, &nb); + hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant unknown", &constant_desc, &nb); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); hr = ID3DXConstantTable_GetConstantDesc(constant_table, "Constant3", &constant_desc, &nb); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr);

1 0

Matteo Bruni : d3dx9: Don't complain when overwriting effect object id 0.
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: e7021c6a036be1aaa6bebc5b01f8c780f4b7e517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7021c6a036be1aaa6bebc5b0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Apr 17 19:15:17 2016 +0200 d3dx9: Don't complain when overwriting effect object id 0. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5753683..aa939a1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4764,10 +4764,17 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr) return D3D_OK; } -static HRESULT d3dx9_copy_data(struct d3dx_object *object, const char **ptr) +static HRESULT d3dx9_copy_data(struct d3dx9_base_effect *base, unsigned int object_id, const char **ptr) { + struct d3dx_object *object = &base->objects[object_id]; + if (object->size || object->data) - FIXME("Object already initialized!\n"); + { + if (object_id) + FIXME("Overwriting object id %u!\n", object_id); + else + TRACE("Overwriting object id 0.\n"); + } read_dword(ptr, &object->size); TRACE("Data size: %#x\n", object->size); @@ -5570,7 +5577,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case D3DXPT_VERTEXSHADER: case D3DXPT_PIXELSHADER: state->type = ST_CONSTANT; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; if (object->data) @@ -5586,7 +5593,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case D3DXPT_FLOAT: case D3DXPT_STRING: state->type = ST_FXLC; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; d3dx_create_param_eval(base, object->data, object->size, param->type, &param->param_eval); break; @@ -5599,7 +5606,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case 1: state->type = ST_PARAMETER; - if (FAILED(hr = d3dx9_copy_data(&base->objects[param->object_id], ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); @@ -5627,7 +5634,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * case 2: state->type = ST_ARRAY_SELECTOR; - if (FAILED(hr = d3dx9_copy_data(object, ptr))) + if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; hr = d3dx9_parse_array_selector(base, param); break; @@ -5727,7 +5734,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da read_dword(&ptr, &id); TRACE("Id: %u\n", id); - if (FAILED(hr = d3dx9_copy_data(&base->objects[id], &ptr))) + if (FAILED(hr = d3dx9_copy_data(base, id, &ptr))) goto err_out; if (base->objects[id].data)

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in context_find_fbo_entry().
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: e7031197a10ed33d209b850600aa571acc518f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7031197a10ed33d209b85060… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 17 19:07:49 2016 +0200 wined3d: Use the texture dimension helpers in context_find_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 52 +++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3cd7c8c..e33d37e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -474,30 +474,30 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, DWORD color_location, DWORD ds_location) { const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int object_count = gl_info->limits.buffers + 1; + struct wined3d_texture *rt_texture, *ds_texture; struct fbo_entry *entry; - UINT object_count = gl_info->limits.buffers + 1; unsigned int i; if (depth_stencil && render_targets[0]) { - if (wined3d_texture_get_level_width(depth_stencil->container, depth_stencil->texture_level) - < wined3d_texture_get_level_width(render_targets[0]->container, render_targets[0]->texture_level) - || wined3d_texture_get_level_height(depth_stencil->container, depth_stencil->texture_level) - < wined3d_texture_get_level_height(render_targets[0]->container, render_targets[0]->texture_level)) + rt_texture = render_targets[0]->container; + ds_texture = depth_stencil->container; + + if (wined3d_texture_get_level_width(ds_texture, depth_stencil->texture_level) + < wined3d_texture_get_level_width(rt_texture, render_targets[0]->texture_level) + || wined3d_texture_get_level_height(ds_texture, depth_stencil->texture_level) + < wined3d_texture_get_level_height(rt_texture, render_targets[0]->texture_level)) { - WARN("Depth stencil is smaller than the primary color buffer, disabling\n"); + WARN("Depth stencil is smaller than the primary color buffer, disabling.\n"); depth_stencil = NULL; } - else if (depth_stencil->container->resource.multisample_type - != render_targets[0]->container->resource.multisample_type - || depth_stencil->container->resource.multisample_quality - != render_targets[0]->container->resource.multisample_quality) + else if (ds_texture->resource.multisample_type != rt_texture->resource.multisample_type + || ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality) { WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", - render_targets[0]->container->resource.multisample_type, - render_targets[0]->container->resource.multisample_quality, - depth_stencil->container->resource.multisample_type, - depth_stencil->container->resource.multisample_quality); + rt_texture->resource.multisample_type, rt_texture->resource.multisample_quality, + ds_texture->resource.multisample_type, ds_texture->resource.multisample_quality); depth_stencil = NULL; } else @@ -514,22 +514,26 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, { if (render_targets[i]) { - TRACE(" Color attachment %u: (%p) %s gl obj %u(%s) %ux%u %u samples.\n", - i, render_targets[i], debug_d3dformat(render_targets[i]->container->resource.format->id), + rt_texture = render_targets[i]->container; + TRACE(" Color attachment %u: %p format %s, %s %u, %ux%u, %u samples.\n", + i, render_targets[i], debug_d3dformat(rt_texture->resource.format->id), + context->fbo_key->rb_namespace & (1 << (i + 1)) ? "renderbuffer" : "texure", context->fbo_key->objects[i + 1].object, - context->fbo_key->rb_namespace & (1 << (i + 1)) ? "rb" : "texure", - render_targets[i]->pow2Width, render_targets[i]->pow2Height, - render_targets[i]->container->resource.multisample_type); + wined3d_texture_get_level_pow2_width(rt_texture, render_targets[i]->texture_level), + wined3d_texture_get_level_pow2_height(rt_texture, render_targets[i]->texture_level), + rt_texture->resource.multisample_type); } } if (depth_stencil) { - TRACE(" Depth attachment: (%p) %s gl obj %u(%s) %ux%u %u samples.\n", - depth_stencil, debug_d3dformat(depth_stencil->container->resource.format->id), + ds_texture = depth_stencil->container; + TRACE(" Depth attachment: %p format %s, %s %u, %ux%u, %u samples.\n", + depth_stencil, debug_d3dformat(ds_texture->resource.format->id), + context->fbo_key->rb_namespace & (1 << 0) ? "renderbuffer" : "texure", context->fbo_key->objects[0].object, - context->fbo_key->rb_namespace & (1 << 0) ? "rb" : "texure", - depth_stencil->pow2Width, depth_stencil->pow2Height, - depth_stencil->container->resource.multisample_type); + wined3d_texture_get_level_pow2_width(ds_texture, depth_stencil->texture_level), + wined3d_texture_get_level_pow2_height(ds_texture, depth_stencil->texture_level), + ds_texture->resource.multisample_type); } }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in device_clear_render_targets().
by Alexandre Julliard 18 Apr '16

18 Apr '16

Module: wine Branch: master Commit: cb127e7145a0a0bd508cd7cc51468502f2fe567e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb127e7145a0a0bd508cd7cc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 17 19:07:50 2016 +0200 wined3d: Use the texture dimension helpers in device_clear_render_targets(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b1d8631..149234b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -343,8 +343,10 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c else { render_offscreen = TRUE; - drawable_width = depth_stencil->pow2Width; - drawable_height = depth_stencil->pow2Height; + drawable_width = wined3d_texture_get_level_pow2_width(depth_stencil->container, + depth_stencil->texture_level); + drawable_height = wined3d_texture_get_level_pow2_height(depth_stencil->container, + depth_stencil->texture_level); } if (depth_stencil && render_offscreen)

1 0