May 2019 - Wine-commits - list.winehq.org

Paul Gofman : wined3d: Move multiply_vector_matrix() to wined3d_private.h.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 9c95ee38901926b2aca24d95caf25e9b90765e9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c95ee38901926b2aca24d95… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 21 01:45:33 2019 +0430 wined3d: Move multiply_vector_matrix() to wined3d_private.h. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 25 ++++++------------------- dlls/wined3d/wined3d_private.h | 13 +++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f85fb5a..baafaf8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1374,19 +1374,6 @@ static void shader_glsl_ffp_vertex_lightambient_uniform(const struct wined3d_con checkGLcall("glUniform3fv"); } -static void multiply_vector_matrix(struct wined3d_vec4 *dest, const struct wined3d_vec4 *src1, - const struct wined3d_matrix *src2) -{ - struct wined3d_vec4 temp; - - temp.x = (src1->x * src2->_11) + (src1->y * src2->_21) + (src1->z * src2->_31) + (src1->w * src2->_41); - temp.y = (src1->x * src2->_12) + (src1->y * src2->_22) + (src1->z * src2->_32) + (src1->w * src2->_42); - temp.z = (src1->x * src2->_13) + (src1->y * src2->_23) + (src1->z * src2->_33) + (src1->w * src2->_43); - temp.w = (src1->x * src2->_14) + (src1->y * src2->_24) + (src1->z * src2->_34) + (src1->w * src2->_44); - - *dest = temp; -} - static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context *context, const struct wined3d_state *state, unsigned int light, const struct wined3d_light_info *light_info, struct glsl_shader_prog_link *prog) @@ -1402,7 +1389,7 @@ static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context *c switch (light_info->OriginalParms.type) { case WINED3D_LIGHT_POINT: - multiply_vector_matrix(&vec4, &light_info->position, view); + wined3d_vec4_transform(&vec4, &light_info->position, view); GL_EXTCALL(glUniform4fv(prog->vs.light_location[light].position, 1, &vec4.x)); GL_EXTCALL(glUniform1f(prog->vs.light_location[light].range, light_info->OriginalParms.range)); GL_EXTCALL(glUniform1f(prog->vs.light_location[light].c_att, light_info->OriginalParms.attenuation0)); @@ -1411,10 +1398,10 @@ static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context *c break; case WINED3D_LIGHT_SPOT: - multiply_vector_matrix(&vec4, &light_info->position, view); + wined3d_vec4_transform(&vec4, &light_info->position, view); GL_EXTCALL(glUniform4fv(prog->vs.light_location[light].position, 1, &vec4.x)); - multiply_vector_matrix(&vec4, &light_info->direction, view); + wined3d_vec4_transform(&vec4, &light_info->direction, view); GL_EXTCALL(glUniform3fv(prog->vs.light_location[light].direction, 1, &vec4.x)); GL_EXTCALL(glUniform1f(prog->vs.light_location[light].range, light_info->OriginalParms.range)); @@ -1427,12 +1414,12 @@ static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context *c break; case WINED3D_LIGHT_DIRECTIONAL: - multiply_vector_matrix(&vec4, &light_info->direction, view); + wined3d_vec4_transform(&vec4, &light_info->direction, view); GL_EXTCALL(glUniform3fv(prog->vs.light_location[light].direction, 1, &vec4.x)); break; case WINED3D_LIGHT_PARALLELPOINT: - multiply_vector_matrix(&vec4, &light_info->position, view); + wined3d_vec4_transform(&vec4, &light_info->position, view); GL_EXTCALL(glUniform4fv(prog->vs.light_location[light].position, 1, &vec4.x)); break; @@ -1505,7 +1492,7 @@ static void shader_glsl_clip_plane_uniform(const struct wined3d_context *context { invert_matrix(&matrix, &state->transforms[WINED3D_TS_VIEW]); transpose_matrix(&matrix, &matrix); - multiply_vector_matrix(&plane, &plane, &matrix); + wined3d_vec4_transform(&plane, &plane, &matrix); } GL_EXTCALL(glUniform4fv(prog->vs.clip_planes_location + index, 1, &plane.x)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 775ec08..fb2b5df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4878,6 +4878,19 @@ static inline void wined3d_get_material_colour_source(enum wined3d_material_colo *specular = validate_material_colour_source(si->use_map, state->render_states[WINED3D_RS_SPECULARMATERIALSOURCE]); } +static inline void wined3d_vec4_transform(struct wined3d_vec4 *dst, + const struct wined3d_vec4 *v, const struct wined3d_matrix *m) +{ + struct wined3d_vec4 tmp; + + tmp.x = v->x * m->_11 + v->y * m->_21 + v->z * m->_31 + v->w * m->_41; + tmp.y = v->x * m->_12 + v->y * m->_22 + v->z * m->_32 + v->w * m->_42; + tmp.z = v->x * m->_13 + v->y * m->_23 + v->z * m->_33 + v->w * m->_43; + tmp.w = v->x * m->_14 + v->y * m->_24 + v->z * m->_34 + v->w * m->_44; + + *dst = tmp; +} + BOOL invert_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m) DECLSPEC_HIDDEN; void compute_normal_matrix(float *normal_matrix, BOOL legacy_lighting,

1 0

Paul Gofman : wined3d: Implement lighting with directional lights in process_vertices_strided().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 710dfeb425626bc47d82acd4450c8076c987a831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=710dfeb425626bc47d82acd4… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 21 01:45:34 2019 +0430 wined3d: Implement lighting with directional lights in process_vertices_strided(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 4 +- dlls/wined3d/device.c | 311 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 289 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=710dfeb425626bc47d82…

1 0

Paul Gofman : ddraw/tests: Backport test_specular_lighting() for ddraw1.
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 1972e99eddddd83a49d2ce8d0b5dab633fb8e007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1972e99eddddd83a49d2ce8d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 21 01:45:35 2019 +0430 ddraw/tests: Backport test_specular_lighting() for ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 289 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1972e99eddddd83a49d2…

1 0

Paul Gofman : wined3d: Implement point lights in process_vertices_strided( ).
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 1381ca7c5a447d122570d80e145f3518e04f64a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1381ca7c5a447d122570d80e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 21 01:45:36 2019 +0430 wined3d: Implement point lights in process_vertices_strided(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 22b43c4..5c9ccba 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6356,6 +6356,39 @@ static void test_specular_lighting(void) {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, {{0.0f}, {0.0f}, {0.0f}}, {{0.0f}, {0.0f}, {1.0f}}, + }, + point = + { + sizeof(D3DLIGHT2), + D3DLIGHT_POINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.0f}}, + 100.0f, + 0.0f, + 0.0f, 0.0f, 1.0f, + }, + point_side = + { + sizeof(D3DLIGHT2), + D3DLIGHT_POINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{-1.1f}, {0.0f}, {1.1f}}, + {{0.0f}, {0.0f}, {0.0f}}, + 100.0f, + 0.0f, + 1.0f, 0.0f, 0.0f, + }, + point_far = + { + sizeof(D3DLIGHT2), + D3DLIGHT_POINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.1f}}, + {{0.0f}, {0.0f}, {0.0f}}, + 1.0f, + 0.0f, + 1.0f, 0.0f, 0.0f, }; static const struct expected_color { @@ -6374,6 +6407,30 @@ static void test_specular_lighting(void) {320, 360, 0x00717171}, {480, 360, 0x003c3c3c}, }, + expected_point_local[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00090909}, + {480, 120, 0x00000000}, + {160, 240, 0x00090909}, + {320, 240, 0x00fafafa}, + {480, 240, 0x00090909}, + {160, 360, 0x00000000}, + {320, 360, 0x00090909}, + {480, 360, 0x00000000}, + }, + expected_point_far[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00000000}, + {480, 120, 0x00000000}, + {160, 240, 0x00000000}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00000000}, + {160, 360, 0x00000000}, + {320, 360, 0x00000000}, + {480, 360, 0x00000000}, + }, expected_zero[] = { {160, 120, 0x00000000}, @@ -6396,7 +6453,12 @@ static void test_specular_lighting(void) tests[] = { {&directional, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)}, + {&point, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, + {&point_side, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&point_far, 1.0f, expected_point_far, ARRAY_SIZE(expected_point_far)}, {&directional, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&point, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&point_far, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, }; D3DMATRIXHANDLE world_handle, view_handle, proj_handle; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 23aca23..f5b9caa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3292,6 +3292,10 @@ static void init_transformed_lights(struct lights_settings *ls, ++ls->directional_light_count; break; + case WINED3D_LIGHT_POINT: + ++ls->point_light_count; + break; + default: FIXME("Unhandled light type %#x.\n", light_info->OriginalParms.type); continue; @@ -3319,6 +3323,26 @@ static void init_transformed_lights(struct lights_settings *ls, light->specular = light_info->OriginalParms.specular; ++index; } + + for (i = 0; i < light_count; ++i) + { + light_info = lights[i]; + if (light_info->OriginalParms.type != WINED3D_LIGHT_POINT) + continue; + + light = &ls->lights[index]; + + wined3d_vec4_transform(&light->position, &light_info->position, &state->transforms[WINED3D_TS_VIEW]); + light->range = light_info->OriginalParms.range; + light->c_att = light_info->OriginalParms.attenuation0; + light->l_att = light_info->OriginalParms.attenuation1; + light->q_att = light_info->OriginalParms.attenuation2; + + light->diffuse = light_info->OriginalParms.diffuse; + light->ambient = light_info->OriginalParms.ambient; + light->specular = light_info->OriginalParms.specular; + ++index; + } } static void update_light_diffuse_specular(struct wined3d_color *diffuse, struct wined3d_color *specular, @@ -3353,7 +3377,9 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d struct wined3d_vec3 normal_transformed = {0.0f}; struct wined3d_vec4 position_transformed; const struct light_transformed *light; + struct wined3d_vec3 dir, dst; unsigned int i, index; + float att; wined3d_vec4_transform(&position_transformed, position, &ls->modelview_matrix); position_transformed_normalised = *(const struct wined3d_vec3 *)&position_transformed; @@ -3381,6 +3407,41 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d update_light_diffuse_specular(diffuse, specular, &light->direction, 1.0f, material_shininess, &normal_transformed, &position_transformed_normalised, light, ls); } + + for (i = 0; i < ls->point_light_count; ++i, ++index) + { + light = &ls->lights[index]; + dir.x = light->position.x - position_transformed.x; + dir.y = light->position.y - position_transformed.y; + dir.z = light->position.z - position_transformed.z; + + dst.z = wined3d_vec3_dot(&dir, &dir); + dst.y = sqrtf(dst.z); + dst.x = 1.0f; + if (ls->legacy_lighting) + { + dst.y = (light->range - dst.y) / light->range; + if (!(dst.y > 0.0f)) + continue; + dst.z = dst.y * dst.y; + } + else + { + if (!(dst.y <= light->range)) + continue; + } + att = dst.x * light->c_att + dst.y * light->l_att + dst.z * light->q_att; + if (!ls->legacy_lighting) + att = 1.0f / att; + + wined3d_color_rgb_mul_add(ambient, &light->ambient, att); + if (normal) + { + wined3d_vec3_normalise(&dir); + update_light_diffuse_specular(diffuse, specular, &dir, att, material_shininess, + &normal_transformed, &position_transformed_normalised, light, ls); + } + } } /* Context activation is done by the caller. */

1 0

Paul Gofman : wined3d: Implement spot lights in process_vertices_strided() .
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 8c47f565cf1d990c408fc7d9d3b278cfd53cc54a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c47f565cf1d990c408fc7d9… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 21 01:45:37 2019 +0430 wined3d: Implement spot lights in process_vertices_strided(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 26 ++++++++++++++++ dlls/wined3d/device.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 5c9ccba..ee0b1b4 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6368,6 +6368,18 @@ static void test_specular_lighting(void) 0.0f, 0.0f, 0.0f, 1.0f, }, + spot = + { + sizeof(D3DLIGHT2), + D3DLIGHT_SPOT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {1.0f}}, + 100.0f, + 1.0f, + 0.0f, 0.0f, 1.0f, + M_PI / 12.0f, M_PI / 3.0f + }, point_side = { sizeof(D3DLIGHT2), @@ -6419,6 +6431,18 @@ static void test_specular_lighting(void) {320, 360, 0x00090909}, {480, 360, 0x00000000}, }, + expected_spot_local[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00020202}, + {480, 120, 0x00000000}, + {160, 240, 0x00020202}, + {320, 240, 0x00fafafa}, + {480, 240, 0x00020202}, + {160, 360, 0x00000000}, + {320, 360, 0x00020202}, + {480, 360, 0x00000000}, + }, expected_point_far[] = { {160, 120, 0x00000000}, @@ -6454,10 +6478,12 @@ static void test_specular_lighting(void) { {&directional, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)}, {&point, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, + {&spot, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, {&point_side, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, {&point_far, 1.0f, expected_point_far, ARRAY_SIZE(expected_point_far)}, {&directional, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, {&point, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&spot, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, {&point_far, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f5b9caa..33aba88 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3296,6 +3296,10 @@ static void init_transformed_lights(struct lights_settings *ls, ++ls->point_light_count; break; + case WINED3D_LIGHT_SPOT: + ++ls->spot_light_count; + break; + default: FIXME("Unhandled light type %#x.\n", light_info->OriginalParms.type); continue; @@ -3343,6 +3347,32 @@ static void init_transformed_lights(struct lights_settings *ls, light->specular = light_info->OriginalParms.specular; ++index; } + + for (i = 0; i < light_count; ++i) + { + light_info = lights[i]; + if (light_info->OriginalParms.type != WINED3D_LIGHT_SPOT) + continue; + + light = &ls->lights[index]; + + wined3d_vec4_transform(&light->position, &light_info->position, &state->transforms[WINED3D_TS_VIEW]); + wined3d_vec4_transform(&vec4, &light_info->direction, &state->transforms[WINED3D_TS_VIEW]); + light->direction = *(struct wined3d_vec3 *)&vec4; + wined3d_vec3_normalise(&light->direction); + light->range = light_info->OriginalParms.range; + light->falloff = light_info->OriginalParms.falloff; + light->c_att = light_info->OriginalParms.attenuation0; + light->l_att = light_info->OriginalParms.attenuation1; + light->q_att = light_info->OriginalParms.attenuation2; + light->cos_htheta = cosf(light_info->OriginalParms.theta / 2.0f); + light->cos_hphi = cosf(light_info->OriginalParms.phi / 2.0f); + + light->diffuse = light_info->OriginalParms.diffuse; + light->ambient = light_info->OriginalParms.ambient; + light->specular = light_info->OriginalParms.specular; + ++index; + } } static void update_light_diffuse_specular(struct wined3d_color *diffuse, struct wined3d_color *specular, @@ -3442,6 +3472,54 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d &normal_transformed, &position_transformed_normalised, light, ls); } } + + for (i = 0; i < ls->spot_light_count; ++i, ++index) + { + float t; + + light = &ls->lights[index]; + + dir.x = light->position.x - position_transformed.x; + dir.y = light->position.y - position_transformed.y; + dir.z = light->position.z - position_transformed.z; + + dst.z = wined3d_vec3_dot(&dir, &dir); + dst.y = sqrtf(dst.z); + dst.x = 1.0f; + + if (ls->legacy_lighting) + { + dst.y = (light->range - dst.y) / light->range; + if (!(dst.y > 0.0f)) + continue; + dst.z = dst.y * dst.y; + } + else + { + if (!(dst.y <= light->range)) + continue; + } + wined3d_vec3_normalise(&dir); + t = -wined3d_vec3_dot(&dir, &light->direction); + if (t > light->cos_htheta) + att = 1.0f; + else if (t <= light->cos_hphi) + att = 0.0f; + else + att = powf((t - light->cos_hphi) / (light->cos_htheta - light->cos_hphi), light->falloff); + + t = dst.x * light->c_att + dst.y * light->l_att + dst.z * light->q_att; + if (ls->legacy_lighting) + att *= t; + else + att /= t; + + wined3d_color_rgb_mul_add(ambient, &light->ambient, att); + + if (normal) + update_light_diffuse_specular(diffuse, specular, &dir, att, material_shininess, + &normal_transformed, &position_transformed_normalised, light, ls); + } } /* Context activation is done by the caller. */

1 0

Paul Gofman : wined3d: Implement parallel point lights in process_vertices_strided().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 9344d58a9ac066db6277e0fded32f5102a2409e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9344d58a9ac066db6277e0fd… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 21 01:45:38 2019 +0430 wined3d: Implement parallel point lights in process_vertices_strided(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 22 ++++++++++++++++++++++ dlls/wined3d/device.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ee0b1b4..68428e2 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6380,6 +6380,14 @@ static void test_specular_lighting(void) 0.0f, 0.0f, 1.0f, M_PI / 12.0f, M_PI / 3.0f }, + parallelpoint = + { + sizeof(D3DLIGHT2), + D3DLIGHT_PARALLELPOINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{0.5f}, {0.0f}, {-1.0f}}, + {{0.0f}, {0.0f}, {0.0f}}, + }, point_side = { sizeof(D3DLIGHT2), @@ -6443,6 +6451,18 @@ static void test_specular_lighting(void) {320, 360, 0x00020202}, {480, 360, 0x00000000}, }, + expected_parallelpoint[] = + { + {160, 120, 0x00050505}, + {320, 120, 0x002c2c2c}, + {480, 120, 0x006e6e6e}, + {160, 240, 0x00090909}, + {320, 240, 0x00717171}, + {480, 240, 0x00ffffff}, + {160, 360, 0x00050505}, + {320, 360, 0x002c2c2c}, + {480, 360, 0x006e6e6e}, + }, expected_point_far[] = { {160, 120, 0x00000000}, @@ -6479,11 +6499,13 @@ static void test_specular_lighting(void) {&directional, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)}, {&point, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, {&spot, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, + {&parallelpoint, 30.0f, expected_parallelpoint, ARRAY_SIZE(expected_parallelpoint)}, {&point_side, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, {&point_far, 1.0f, expected_point_far, ARRAY_SIZE(expected_point_far)}, {&directional, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, {&point, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, {&spot, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&parallelpoint, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, {&point_far, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 33aba88..751676b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3300,6 +3300,10 @@ static void init_transformed_lights(struct lights_settings *ls, ++ls->spot_light_count; break; + case WINED3D_LIGHT_PARALLELPOINT: + ++ls->parallel_point_light_count; + break; + default: FIXME("Unhandled light type %#x.\n", light_info->OriginalParms.type); continue; @@ -3373,6 +3377,23 @@ static void init_transformed_lights(struct lights_settings *ls, light->specular = light_info->OriginalParms.specular; ++index; } + + for (i = 0; i < light_count; ++i) + { + light_info = lights[i]; + if (light_info->OriginalParms.type != WINED3D_LIGHT_PARALLELPOINT) + continue; + + light = &ls->lights[index]; + + wined3d_vec4_transform(&vec4, &light_info->position, &state->transforms[WINED3D_TS_VIEW]); + *(struct wined3d_vec3 *)&light->position = *(struct wined3d_vec3 *)&vec4; + wined3d_vec3_normalise((struct wined3d_vec3 *)&light->position); + light->diffuse = light_info->OriginalParms.diffuse; + light->ambient = light_info->OriginalParms.ambient; + light->specular = light_info->OriginalParms.specular; + ++index; + } } static void update_light_diffuse_specular(struct wined3d_color *diffuse, struct wined3d_color *specular, @@ -3520,6 +3541,16 @@ static void compute_light(struct wined3d_color *ambient, struct wined3d_color *d update_light_diffuse_specular(diffuse, specular, &dir, att, material_shininess, &normal_transformed, &position_transformed_normalised, light, ls); } + + for (i = 0; i < ls->parallel_point_light_count; ++i, ++index) + { + light = &ls->lights[index]; + + wined3d_color_rgb_mul_add(ambient, &light->ambient, 1.0f); + if (normal) + update_light_diffuse_specular(diffuse, specular, (const struct wined3d_vec3 *)&light->position, + 1.0f, material_shininess, &normal_transformed, &position_transformed_normalised, light, ls); + } } /* Context activation is done by the caller. */

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_set_gl_context().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 6fcc5f11fabcb1163969481a814b3ee2956d0525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fcc5f11fabcb1163969481a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 21 02:29:03 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_set_gl_context(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index aa4d260..db0c9f2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1225,65 +1225,65 @@ success: return TRUE; } -static BOOL context_set_gl_context(struct wined3d_context *ctx) +static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(ctx); - struct wined3d_swapchain *swapchain = ctx->swapchain; + struct wined3d_swapchain *swapchain = context_gl->c.swapchain; BOOL backup = FALSE; if (!wined3d_context_gl_set_pixel_format(context_gl)) { WARN("Failed to set pixel format %d on device context %p.\n", - ctx->pixel_format, ctx->hdc); + context_gl->c.pixel_format, context_gl->c.hdc); backup = TRUE; } - if (backup || !wglMakeCurrent(ctx->hdc, ctx->glCtx)) + if (backup || !wglMakeCurrent(context_gl->c.hdc, context_gl->c.glCtx)) { WARN("Failed to make GL context %p current on device context %p, last error %#x.\n", - ctx->glCtx, ctx->hdc, GetLastError()); - ctx->valid = 0; + context_gl->c.glCtx, context_gl->c.hdc, GetLastError()); + context_gl->c.valid = 0; WARN("Trying fallback to the backup window.\n"); /* FIXME: If the context is destroyed it's no longer associated with * a swapchain, so we can't use the swapchain to get a backup dc. To * make this work windowless contexts would need to be handled by the * device. */ - if (ctx->destroyed || !swapchain) + if (context_gl->c.destroyed || !swapchain) { - FIXME("Unable to get backup dc for destroyed context %p.\n", ctx); + FIXME("Unable to get backup dc for destroyed context %p.\n", context_gl); context_set_current(NULL); return FALSE; } - if (!(ctx->hdc = swapchain_get_backup_dc(swapchain))) + if (!(context_gl->c.hdc = swapchain_get_backup_dc(swapchain))) { context_set_current(NULL); return FALSE; } - ctx->hdc_is_private = TRUE; - ctx->hdc_has_format = FALSE; + context_gl->c.hdc_is_private = TRUE; + context_gl->c.hdc_has_format = FALSE; if (!wined3d_context_gl_set_pixel_format(context_gl)) { ERR("Failed to set pixel format %d on device context %p.\n", - ctx->pixel_format, ctx->hdc); + context_gl->c.pixel_format, context_gl->c.hdc); context_set_current(NULL); return FALSE; } - if (!wglMakeCurrent(ctx->hdc, ctx->glCtx)) + if (!wglMakeCurrent(context_gl->c.hdc, context_gl->c.glCtx)) { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", - ctx->hdc, GetLastError()); + context_gl->c.hdc, GetLastError()); context_set_current(NULL); return FALSE; } - ctx->valid = 1; + context_gl->c.valid = 1; } - ctx->needs_set = 0; + context_gl->c.needs_set = 0; + return TRUE; } @@ -1337,7 +1337,7 @@ void wined3d_context_cleanup(struct wined3d_context *context) if (restore_ctx == context->glCtx) restore_ctx = NULL; else if (context->valid) - context_set_gl_context(context); + wined3d_context_gl_set_gl_context(context_gl); wined3d_context_gl_restore_pixel_format(context_gl); if (restore_ctx) @@ -1377,7 +1377,7 @@ void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) if (restore_ctx == context_gl->c.glCtx) restore_ctx = NULL; else if (context_gl->c.valid) - context_set_gl_context(&context_gl->c); + wined3d_context_gl_set_gl_context(context_gl); if (context_gl->c.valid) { @@ -1557,6 +1557,8 @@ BOOL context_set_current(struct wined3d_context *ctx) if (ctx) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(ctx); + if (!ctx->valid) { ERR("Trying to make invalid context %p current\n", ctx); @@ -1564,7 +1566,7 @@ BOOL context_set_current(struct wined3d_context *ctx) } TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", ctx, ctx->glCtx, ctx->hdc); - if (!context_set_gl_context(ctx)) + if (!wined3d_context_gl_set_gl_context(context_gl)) return FALSE; ctx->current = 1; } @@ -4213,6 +4215,8 @@ static void context_setup_target(struct wined3d_context *context, static void context_activate(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + context_enter(context); context_update_window(context); context_setup_target(context, texture, sub_resource_idx); @@ -4226,7 +4230,7 @@ static void context_activate(struct wined3d_context *context, } else if (context->needs_set) { - context_set_gl_context(context); + wined3d_context_gl_set_gl_context(context_gl); } }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_update_window().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: ef4f0ebb2cbeba3c7f93f1ba93809b46b26e2e5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef4f0ebb2cbeba3c7f93f1ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 21 02:29:04 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_update_window(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index db0c9f2..e2e67ef 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1297,30 +1297,30 @@ static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HD } } -static void context_update_window(struct wined3d_context *context) +static void wined3d_context_gl_update_window(struct wined3d_context_gl *context_gl) { - if (!context->swapchain) + if (!context_gl->c.swapchain) return; - if (context->win_handle == context->swapchain->win_handle) + if (context_gl->c.win_handle == context_gl->c.swapchain->win_handle) return; TRACE("Updating context %p window from %p to %p.\n", - context, context->win_handle, context->swapchain->win_handle); + context_gl, context_gl->c.win_handle, context_gl->c.swapchain->win_handle); - if (context->hdc) - wined3d_release_dc(context->win_handle, context->hdc); + if (context_gl->c.hdc) + wined3d_release_dc(context_gl->c.win_handle, context_gl->c.hdc); - context->win_handle = context->swapchain->win_handle; - context->hdc_is_private = FALSE; - context->hdc_has_format = FALSE; - context->needs_set = 1; - context->valid = 1; + context_gl->c.win_handle = context_gl->c.swapchain->win_handle; + context_gl->c.hdc_is_private = FALSE; + context_gl->c.hdc_has_format = FALSE; + context_gl->c.needs_set = 1; + context_gl->c.valid = 1; - if (!(context->hdc = GetDCEx(context->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) + if (!(context_gl->c.hdc = GetDCEx(context_gl->c.win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { - ERR("Failed to get a device context for window %p.\n", context->win_handle); - context->valid = 0; + ERR("Failed to get a device context for window %p.\n", context_gl->c.win_handle); + context_gl->c.valid = 0; } } @@ -4218,7 +4218,7 @@ static void context_activate(struct wined3d_context *context, struct wined3d_context_gl *context_gl = wined3d_context_gl(context); context_enter(context); - context_update_window(context); + wined3d_context_gl_update_window(context_gl); context_setup_target(context, texture, sub_resource_idx); if (!context->valid) return;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_enter().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 120632599453fed3bc8ff7bce64e9afe03f3398b URL: https://source.winehq.org/git/wine.git/?a=commit;h=120632599453fed3bc8ff7bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 21 02:29:05 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_enter(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e2e67ef..d8ea5e8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1633,11 +1633,11 @@ void context_restore(struct wined3d_context *context, struct wined3d_texture *te context_release(context); } -static void context_enter(struct wined3d_context *context) +static void wined3d_context_gl_enter(struct wined3d_context_gl *context_gl) { - TRACE("Entering context %p, level %u.\n", context, context->level + 1); + TRACE("Entering context %p, level %u.\n", context_gl, context_gl->c.level + 1); - if (!context->level++) + if (!context_gl->c.level++) { const struct wined3d_context *current_context = context_get_current(); HGLRC current_gl = wglGetCurrentContext(); @@ -1646,13 +1646,13 @@ static void context_enter(struct wined3d_context *context) { TRACE("Another GL context (%p on device context %p) is already current.\n", current_gl, wglGetCurrentDC()); - context->restore_ctx = current_gl; - context->restore_dc = wglGetCurrentDC(); - context->needs_set = 1; + context_gl->c.restore_ctx = current_gl; + context_gl->c.restore_dc = wglGetCurrentDC(); + context_gl->c.needs_set = 1; } - else if (!context->needs_set && !(context->hdc_is_private && context->hdc_has_format) - && context->pixel_format != context->gl_info->gl_ops.wgl.p_wglGetPixelFormat(context->hdc)) - context->needs_set = 1; + else if (!context_gl->c.needs_set && !(context_gl->c.hdc_is_private && context_gl->c.hdc_has_format) + && context_gl->c.pixel_format != context_gl->c.gl_info->gl_ops.wgl.p_wglGetPixelFormat(context_gl->c.hdc)) + context_gl->c.needs_set = 1; } } @@ -2113,7 +2113,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!context->pixel_format) return E_FAIL; - context_enter(context); + wined3d_context_gl_enter(context_gl); if (!wined3d_context_gl_set_pixel_format(context_gl)) { @@ -4217,7 +4217,7 @@ static void context_activate(struct wined3d_context *context, { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - context_enter(context); + wined3d_context_gl_enter(context_gl); wined3d_context_gl_update_window(context_gl); context_setup_target(context, texture, sub_resource_idx); if (!context->valid)

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_get_rt_size().
by Alexandre Julliard 21 May '19

21 May '19

Module: wine Branch: master Commit: 9aaf9a273b0cb2fed1b29b6399ecc7ec00d8706b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aaf9a273b0cb2fed1b29b63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 21 02:29:06 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_get_rt_size(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d8ea5e8..7960305 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2413,23 +2413,23 @@ const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d return context_gl->tex_unit_map; } -static void context_get_rt_size(const struct wined3d_context *context, SIZE *size) +static void wined3d_context_gl_get_rt_size(const struct wined3d_context_gl *context_gl, SIZE *size) { - const struct wined3d_texture *rt = context->current_rt.texture; + const struct wined3d_texture *rt = context_gl->c.current_rt.texture; unsigned int level; if (rt->swapchain) { RECT window_size; - GetClientRect(context->win_handle, &window_size); + GetClientRect(context_gl->c.win_handle, &window_size); size->cx = window_size.right - window_size.left; size->cy = window_size.bottom - window_size.top; return; } - level = context->current_rt.sub_resource_idx % rt->level_count; + level = context_gl->c.current_rt.sub_resource_idx % rt->level_count; size->cx = wined3d_texture_get_level_width(rt, level); size->cy = wined3d_texture_get_level_height(rt, level); } @@ -2811,7 +2811,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); - context_get_rt_size(context, &rt_size); + wined3d_context_gl_get_rt_size(context_gl, &rt_size); if (context->last_was_blit) { @@ -2932,7 +2932,7 @@ void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_ { SIZE rt_size; - context_get_rt_size(context, &rt_size); + wined3d_context_gl_get_rt_size(context_gl, &rt_size); if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) context_apply_blit_projection(context, rt_size.cx, rt_size.cy); wined3d_context_gl_apply_blit_state(context_gl, device); @@ -5636,7 +5636,7 @@ void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_te apply_texture_blit_state(gl_info, &texture_gl->texture_rgb, info.bind_target, level, filter); gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); - context_get_rt_size(context, &dst_size); + wined3d_context_gl_get_rt_size(context_gl, &dst_size); w = dst_size.cx; h = dst_size.cy;

1 0