Module: wine Branch: master Commit: 38d5b29ae172a96e70b45a6a5fcd03dbf72b2df1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d5b29ae172a96e70b45a6a5f... Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat May 20 13:46:04 2017 +0200 wined3d: Add support for output registers relative addressing. Required for tessellation shaders. 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/glsl_shader.c | 6 ++++-- dlls/wined3d/shader.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 27f089f..2ace2b4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2906,8 +2906,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0: WINED3DSPR_OUTPUT */ if (reg->idx[0].rel_addr) - FIXME("VS3 output registers relative addressing.\n"); - sprintf(register_name, "%s_out[%u]", prefix, reg->idx[0].offset); + sprintf(register_name, "%s_out[%s + %u]", + prefix, rel_param0.param_str, reg->idx[0].offset); + else + sprintf(register_name, "%s_out[%u]", prefix, reg->idx[0].offset); break; case WINED3DSPR_MISCTYPE: diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 74cb92e..177ca1b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1398,7 +1398,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } break; - case WINED3DSPR_TEXCRDOUT: + case WINED3DSPR_TEXCRDOUT: /* WINED3DSPR_OUTPUT */ if (shader_version.major >= 3) { if (idx >= ARRAY_SIZE(reg_maps->u.output_registers_mask))