ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Avoid barrier() in tessellation control shader if possible. 

Synchronization is only needed when output variables are read.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2017-05-25 10:22:11 +02:00 committed by Alexandre Julliard
parent 114f9791d2
commit 4597ef6696
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/glsl_shader.c
View File

@ -7610,7 +7610,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *con
shader_addline(buffer, "void main()\n{\n"); shader_addline(buffer, "void main()\n{\n");
shader_addline(buffer, "hs_control_point_phase();\n"); shader_addline(buffer, "hs_control_point_phase();\n");
if (hs->phases.fork_count || hs->phases.join_count) if (reg_maps->vocp)
shader_addline(buffer, "barrier();\n"); shader_addline(buffer, "barrier();\n");
for (i = 0; i < hs->phases.fork_count; ++i) for (i = 0; i < hs->phases.fork_count; ++i)
shader_glsl_generate_shader_phase_invocation(buffer, &hs->phases.fork[i], "fork", i); shader_glsl_generate_shader_phase_invocation(buffer, &hs->phases.fork[i], "fork", i);

4
dlls/wined3d/shader.c
View File

@ -801,6 +801,10 @@ static BOOL shader_record_register_usage(struct wined3d_shader *shader, struct w
reg_maps->rt_mask |= (1u << reg->idx[0].offset); reg_maps->rt_mask |= (1u << reg->idx[0].offset);
break; break;
case WINED3DSPR_OUTCONTROLPOINT:
reg_maps->vocp = 1;
break;
default: default:
TRACE("Not recording register of type %#x and [%#x][%#x].\n", TRACE("Not recording register of type %#x and [%#x][%#x].\n",
reg->type, reg->idx[0].offset, reg->idx[1].offset); reg->type, reg->idx[0].offset, reg->idx[1].offset);

3
dlls/wined3d/wined3d_private.h
View File

@ -1012,7 +1012,8 @@ struct wined3d_shader_reg_maps
WORD usescall : 1; WORD usescall : 1;
WORD usespow : 1; WORD usespow : 1;
WORD point_size : 1; WORD point_size : 1;
WORD padding : 2; WORD vocp : 1;
WORD padding : 1;
DWORD rt_mask; /* Used render targets, 32 max. */ DWORD rt_mask; /* Used render targets, 32 max. */