wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Paul Gofman : d3dx9: Reference top level parameter instead of dirty flag.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 2be74048d6220a5439d41940c9870dac6ab5eb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be74048d6220a5439d41940c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:47 2017 +0300 d3dx9: Reference top level parameter instead of dirty flag. 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/d3dx9_private.h | 4 ++-- dlls/d3dx9_36/effect.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 145ab80..da4564d 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -218,12 +218,12 @@ struct d3dx_parameter struct d3dx_parameter *referenced_param; struct d3dx_param_eval *param_eval; - DWORD *dirty_flag_ptr; + struct d3dx_parameter *top_level_param; }; static inline BOOL is_param_dirty(struct d3dx_parameter *param) { - return *param->dirty_flag_ptr & PARAMETER_FLAG_DIRTY; + return param->top_level_param->runtime_flags & PARAMETER_FLAG_DIRTY; } struct d3dx9_base_effect; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8dc4738..8861a05 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1332,7 +1332,7 @@ static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep static void set_dirty(struct d3dx_parameter *param) { - *param->dirty_flag_ptr |= PARAMETER_FLAG_DIRTY; + param->top_level_param->runtime_flags |= PARAMETER_FLAG_DIRTY; } static void clear_dirty_params(struct d3dx9_base_effect *base) @@ -1340,7 +1340,7 @@ static void clear_dirty_params(struct d3dx9_base_effect *base) unsigned int i; for (i = 0; i < base->parameter_count; ++i) - *base->parameters[i].dirty_flag_ptr &= ~PARAMETER_FLAG_DIRTY; + base->parameters[i].runtime_flags &= ~PARAMETER_FLAG_DIRTY; } static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, @@ -5878,9 +5878,9 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return hr; } -static BOOL param_set_dirty_flag_ptr(void *dirty_flag_ptr, struct d3dx_parameter *param) +static BOOL param_set_top_level_param(void *top_level_param, struct d3dx_parameter *param) { - param->dirty_flag_ptr = (DWORD *)dirty_flag_ptr; + param->top_level_param = top_level_param; return FALSE; } @@ -5992,8 +5992,8 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da } for (i = 0; i < base->parameter_count; ++i) - walk_parameter_tree(&base->parameters[i], param_set_dirty_flag_ptr, - &base->parameters[i].runtime_flags); + walk_parameter_tree(&base->parameters[i], param_set_top_level_param, + &base->parameters[i]); return D3D_OK; err_out:

1 0

Paul Gofman : d3dx9/tests: Add more tests for IsParameterUsed() function.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: bc655a40ec6c77c48347aef9e9f508f53ea7bcf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc655a40ec6c77c48347aef9e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 24 14:36:46 2017 +0300 d3dx9/tests: Add more tests for IsParameterUsed() function. 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/effect.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b1f7f3e..fdbc579 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5937,6 +5937,34 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) effect3->lpVtbl->GetFloat(effect3, param, &fvect.x); ok(fvect.x == 0.0f, "Unexpected parameter value %g.\n", fvect.x); + param = effect1->lpVtbl->GetParameterByName(effect1, NULL, "arr2"); + ok(!!param, "GetParameterByName failed.\n"); + ok(!effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + + param = effect3->lpVtbl->GetParameterByName(effect3, NULL, "arr2"); + ok(!!param, "GetParameterByName failed.\n"); + ok(effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + + param = effect1->lpVtbl->GetParameterByName(effect1, NULL, "vs_arr2"); + ok(!!param, "GetParameterByName failed.\n"); + ok(!effect3->lpVtbl->IsParameterUsed(effect3, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + + todo_wine + ok(effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2", "tech0"), + "Unexpected IsParameterUsed result.\n"); + todo_wine + ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[0]", "tech0"), + "Unexpected IsParameterUsed result.\n"); + todo_wine + ok(!effect3->lpVtbl->IsParameterUsed(effect3, "vs_arr2[1]", "tech0"), + "Unexpected IsParameterUsed result.\n"); + + ok(effect1->lpVtbl->IsParameterUsed(effect1, param, "tech0"), + "Unexpected IsParameterUsed result.\n"); + hr = effect3->lpVtbl->Begin(effect3, &passes_count, 0); ok(hr == D3D_OK, "Got result %#x.\n", hr);

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_color.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 7b93124e0e9948a3c66b4f9740711f3c92e1ea10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b93124e0e9948a3c66b4f974… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 24 23:31:33 2017 +0200 d3dx9/tests: Cleanup expect_color. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.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 | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 62afcdf..9f40d86 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -29,8 +29,6 @@ #define relative_error(exp, out) (fabsf(exp) < 1e-38f ? fabsf(exp - out) : fabsf(1.0f - (out) / (exp))) -#define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a); - static BOOL compare_float(float f, float g, unsigned int ulps) { int x = *(int *)&f; @@ -47,6 +45,14 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +static BOOL compare_color(const D3DXCOLOR *c1, const D3DXCOLOR *c2, unsigned int ulps) +{ + return compare_float(c1->r, c2->r, ulps) + && compare_float(c1->g, c2->g, ulps) + && compare_float(c1->b, c2->b, ulps) + && compare_float(c1->a, c2->a, ulps); +} + static BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2, unsigned int ulps) { unsigned int i, j; @@ -63,6 +69,15 @@ static BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2, unsigned return TRUE; } +#define expect_color(expected, color, ulps) expect_color_(__LINE__, expected, color, ulps) +static void expect_color_(unsigned int line, const D3DXCOLOR *expected, const D3DXCOLOR *color, unsigned int ulps) +{ + BOOL equal = compare_color(expected, color, ulps); + ok_(__FILE__, line)(equal, + "Got unexpected color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + color->r, color->g, color->b, color->a, expected->r, expected->g, expected->b, expected->a); +} + #define expect_matrix(expected, matrix, ulps) expect_matrix_(__LINE__, expected, matrix, ulps) static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const D3DXMATRIX *matrix, unsigned int ulps) { @@ -155,7 +170,7 @@ static void D3DXColorTest(void) /*_______________D3DXColorAdd________________*/ expected.r = 0.9f; expected.g = 1.05f; expected.b = 0.99f, expected.a = 0.93f; D3DXColorAdd(&got,&color1,&color2); - expect_color(expected,got); + expect_color(&expected, &got, 1); /* Test the NULL case */ funcpointer = D3DXColorAdd(&got,NULL,&color2); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -167,17 +182,17 @@ static void D3DXColorTest(void) /*_______________D3DXColorAdjustContrast______*/ expected.r = 0.41f; expected.g = 0.575f; expected.b = 0.473f, expected.a = 0.93f; D3DXColorAdjustContrast(&got,&color,scale); - expect_color(expected,got); + expect_color(&expected, &got, 0); /*_______________D3DXColorAdjustSaturation______*/ expected.r = 0.486028f; expected.g = 0.651028f; expected.b = 0.549028f, expected.a = 0.93f; D3DXColorAdjustSaturation(&got,&color,scale); - expect_color(expected,got); + expect_color(&expected, &got, 16); /*_______________D3DXColorLerp________________*/ expected.r = 0.32f; expected.g = 0.69f; expected.b = 0.356f; expected.a = 0.897f; D3DXColorLerp(&got,&color,&color1,scale); - expect_color(expected,got); + expect_color(&expected, &got, 0); /* Test the NULL case */ funcpointer = D3DXColorLerp(&got,NULL,&color1,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -189,7 +204,7 @@ static void D3DXColorTest(void) /*_______________D3DXColorModulate________________*/ expected.r = 0.18f; expected.g = 0.275f; expected.b = 0.1748f; expected.a = 0.0902f; D3DXColorModulate(&got,&color1,&color2); - expect_color(expected,got); + expect_color(&expected, &got, 0); /* Test the NULL case */ funcpointer = D3DXColorModulate(&got,NULL,&color2); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -201,17 +216,17 @@ static void D3DXColorTest(void) /*_______________D3DXColorNegative________________*/ expected.r = 0.8f; expected.g = 0.25f; expected.b = 0.59f; expected.a = 0.93f; D3DXColorNegative(&got,&color); - expect_color(got,expected); + expect_color(&expected, &got, 1); /* Test the greater than 1 case */ color1.r = 0.2f; color1.g = 1.75f; color1.b = 0.41f; color1.a = 0.93f; expected.r = 0.8f; expected.g = -0.75f; expected.b = 0.59f; expected.a = 0.93f; D3DXColorNegative(&got,&color1); - expect_color(got,expected); + expect_color(&expected, &got, 1); /* Test the negative case */ color1.r = 0.2f; color1.g = -0.75f; color1.b = 0.41f; color1.a = 0.93f; expected.r = 0.8f; expected.g = 1.75f; expected.b = 0.59f; expected.a = 0.93f; D3DXColorNegative(&got,&color1); - expect_color(got,expected); + expect_color(&expected, &got, 1); /* Test the NULL case */ funcpointer = D3DXColorNegative(&got,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -221,7 +236,7 @@ static void D3DXColorTest(void) /*_______________D3DXColorScale________________*/ expected.r = 0.06f; expected.g = 0.225f; expected.b = 0.123f; expected.a = 0.279f; D3DXColorScale(&got,&color,scale); - expect_color(expected,got); + expect_color(&expected, &got, 1); /* Test the NULL case */ funcpointer = D3DXColorScale(&got,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -231,7 +246,7 @@ static void D3DXColorTest(void) /*_______________D3DXColorSubtract_______________*/ expected.r = -0.1f; expected.g = 0.25f; expected.b = -0.35f, expected.a = 0.82f; D3DXColorSubtract(&got,&color,&color2); - expect_color(expected,got); + expect_color(&expected, &got, 1); /* Test the NULL case */ funcpointer = D3DXColorSubtract(&got,NULL,&color2); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_mat.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: ff3f2ee9b93c6f92cf23de8edf2438586820b974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3f2ee9b93c6f92cf23de8ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 24 23:31:32 2017 +0200 d3dx9/tests: Cleanup expect_mat. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.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 | 158 ++++++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff3f2ee9b93c6f92cf23d…

1 0

Józef Kucia : wined3d: Initialize geometry shader limits when OpenGL 3.2 is supported.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 08e68f4fe852022622de7545ec0d3d9870ead795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e68f4fe852022622de7545e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:50 2017 +0200 wined3d: Initialize geometry shader limits when OpenGL 3.2 is supported. 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 d9a9c6f..f5d4882 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3655,8 +3655,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.samplers[WINED3D_SHADER_TYPE_DOMAIN] = gl_max; TRACE("Max domain samplers: %u.\n", gl_info->limits.samplers[WINED3D_SHADER_TYPE_DOMAIN]); } - if ((!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] || gl_info->supported[ARB_GEOMETRY_SHADER4]) - && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) + if (gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_GEOMETRY_UNIFORM_BLOCKS, &gl_max); gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY] = min(gl_max, WINED3D_MAX_CBS);

1 0

Józef Kucia : d3d11/tests: Add test for ID3DDeviceContextState.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 5bdd59ef7e788feea5fde5b6f078353dec8ba511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bdd59ef7e788feea5fde5b6f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:49 2017 +0200 d3d11/tests: Add test for ID3DDeviceContextState. 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 | 91 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index dfe50c6..5d3b818 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -21,7 +21,7 @@ #include <stdlib.h> #define COBJMACROS #include "initguid.h" -#include "d3d11.h" +#include "d3d11_1.h" #include "wine/test.h" #include <limits.h> @@ -5291,6 +5291,94 @@ static void test_private_data(void) ok(!refcount, "Test object has %u references left.\n", refcount); } +static void test_device_context_state(void) +{ + ID3DDeviceContextState *context_state, *previous_context_state; + ID3D11SamplerState *sampler, *tmp_sampler; + D3D11_SAMPLER_DESC sampler_desc; + D3D_FEATURE_LEVEL feature_level; + ID3D11DeviceContext1 *context; + ID3D11Device *d3d11_device; + ID3D11Device1 *device; + ULONG refcount; + HRESULT hr; + + if (!(d3d11_device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D11Device_QueryInterface(d3d11_device, &IID_ID3D11Device1, (void **)&device); + ID3D11Device_Release(d3d11_device); + if (FAILED(hr)) + { + skip("ID3D11Device1 is not available.\n"); + return; + } + + feature_level = ID3D11Device1_GetFeatureLevel(device); + ID3D11Device1_GetImmediateContext1(device, &context); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 1.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 1.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 16.0f; + hr = ID3D11Device1_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); + hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, + &IID_ID3D10Device, NULL, &context_state); + ok(SUCCEEDED(hr), "Failed to create device context state, hr %#x.\n", hr); + refcount = get_refcount(context_state); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* Enable ID3D10Device behavior. */ + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3DDeviceContextState_Release(previous_context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + ID3D11SamplerState_Release(sampler); + ID3D11DeviceContext1_Release(context); + refcount = ID3D11Device1_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_blend(void) { ID3D11BlendState *src_blend, *dst_blend; @@ -17591,6 +17679,7 @@ START_TEST(d3d11) test_timestamp_query(); test_device_removed_reason(); test_private_data(); + test_device_context_state(); test_blend(); test_texture(); test_cube_maps();

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSSetShaderResources().
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 094186982b8d93f493f2344dac383499a1f49262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094186982b8d93f493f2344da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:48 2017 +0200 d3d11: Implement d3d11_immediate_context_DSSetShaderResources(). 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/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index acefd77..6552d78 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1192,8 +1192,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]); + + wined3d_device_set_ds_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_ds_resource_view().
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 2654710f449cde98650734fc25dd852a2c62dc87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2654710f449cde98650734fc2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:47 2017 +0200 wined3d: Introduce wined3d_device_set_ds_resource_view(). 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/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b51f660..f5825be 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2724,6 +2724,14 @@ void CDECL wined3d_device_set_ds_cb(struct wined3d_device *device, unsigned int wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_DOMAIN, idx, buffer); } +void CDECL wined3d_device_set_ds_resource_view(struct wined3d_device *device, + unsigned int idx, struct wined3d_shader_resource_view *view) +{ + TRACE("device %p, idx %u, view %p.\n", device, idx, view); + + wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_DOMAIN, idx, view); +} + void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ff43e17..11e7777 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -129,6 +129,7 @@ @ cdecl wined3d_device_set_dialog_box_mode(ptr long) @ cdecl wined3d_device_set_domain_shader(ptr ptr) @ cdecl wined3d_device_set_ds_cb(ptr long ptr) +@ cdecl wined3d_device_set_ds_resource_view(ptr long ptr) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) @ cdecl wined3d_device_set_gs_cb(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a4362b6..55a4ed9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2320,6 +2320,8 @@ void __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); void __cdecl wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_ds_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_set_ds_resource_view(struct wined3d_device *device, + unsigned int idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSSetShaderResources().
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: a077912e6b3da241ce76183ab3c9bad19e87c426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a077912e6b3da241ce76183ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:46 2017 +0200 d3d11: Implement d3d11_immediate_context_HSSetShaderResources(). 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/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 1c38733..acefd77 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1128,8 +1128,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ExecuteCommandList(ID3D11D static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]); + + wined3d_device_set_hs_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_hs_resource_view().
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 96d569042db4c58c7d8458c4c404017a2cb94930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d569042db4c58c7d8458c4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 25 12:25:45 2017 +0200 wined3d: Introduce wined3d_device_set_hs_resource_view(). 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/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index edd11a3..b51f660 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2685,6 +2685,14 @@ void CDECL wined3d_device_set_hs_cb(struct wined3d_device *device, unsigned int wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_HULL, idx, buffer); } +void CDECL wined3d_device_set_hs_resource_view(struct wined3d_device *device, + unsigned int idx, struct wined3d_shader_resource_view *view) +{ + TRACE("device %p, idx %u, view %p.\n", device, idx, view); + + wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_HULL, idx, view); +} + void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 32b2f6c..ff43e17 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -135,6 +135,7 @@ @ cdecl wined3d_device_set_gs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_gs_sampler(ptr long ptr) @ cdecl wined3d_device_set_hs_cb(ptr long ptr) +@ cdecl wined3d_device_set_hs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_hull_shader(ptr ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long long) @ cdecl wined3d_device_set_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5f84c77..a4362b6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2328,6 +2328,8 @@ void __cdecl wined3d_device_set_gs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_hs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); +void __cdecl wined3d_device_set_hs_resource_view(struct wined3d_device *device, + unsigned int idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id, unsigned int offset);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
76
Older →

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 April 2017