wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Add parser support for ComputeShader, DomainShader, and HullShader types.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-08-05 18:41:23 +02:00 committed by Henri Verbeet
parent 2cbad81b55
commit 7c3677b114
Notes: Henri Verbeet 2024-08-06 16:59:31 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/985
7 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d-shader/d3dbc.c
View File

@ -1519,6 +1519,9 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type)
case HLSL_CLASS_UAV: case HLSL_CLASS_UAV:
case HLSL_CLASS_VOID: case HLSL_CLASS_VOID:
case HLSL_CLASS_CONSTANT_BUFFER: case HLSL_CLASS_CONSTANT_BUFFER:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
break; break;
} }
@ -1618,6 +1621,9 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type)
case HLSL_CLASS_UAV: case HLSL_CLASS_UAV:
case HLSL_CLASS_VOID: case HLSL_CLASS_VOID:
case HLSL_CLASS_CONSTANT_BUFFER: case HLSL_CLASS_CONSTANT_BUFFER:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
break; break;
} }

6
libs/vkd3d-shader/fx.c
View File

@ -631,6 +631,9 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
case HLSL_CLASS_TEXTURE: case HLSL_CLASS_TEXTURE:
case HLSL_CLASS_UAV: case HLSL_CLASS_UAV:
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
put_u32_unaligned(buffer, 2); put_u32_unaligned(buffer, 2);
break; break;
@ -1057,6 +1060,9 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type
case HLSL_CLASS_RASTERIZER_STATE: case HLSL_CLASS_RASTERIZER_STATE:
case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_RENDER_TARGET_VIEW:
case HLSL_CLASS_VOID: case HLSL_CLASS_VOID:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
return false; return false;
case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_EFFECT_GROUP:

21
libs/vkd3d-shader/hlsl.c
View File

@ -381,6 +381,9 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
case HLSL_CLASS_VOID: case HLSL_CLASS_VOID:
case HLSL_CLASS_CONSTANT_BUFFER: case HLSL_CLASS_CONSTANT_BUFFER:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
break; break;
} }
} }
@ -451,6 +454,9 @@ static bool type_is_single_component(const struct hlsl_type *type)
case HLSL_CLASS_TEXTURE: case HLSL_CLASS_TEXTURE:
case HLSL_CLASS_UAV: case HLSL_CLASS_UAV:
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
return true; return true;
case HLSL_CLASS_VECTOR: case HLSL_CLASS_VECTOR:
@ -603,6 +609,9 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty
case HLSL_CLASS_TEXTURE: case HLSL_CLASS_TEXTURE:
case HLSL_CLASS_UAV: case HLSL_CLASS_UAV:
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
VKD3D_ASSERT(idx == 0); VKD3D_ASSERT(idx == 0);
break; break;
@ -1003,6 +1012,9 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type)
case HLSL_CLASS_TEXTURE: case HLSL_CLASS_TEXTURE:
case HLSL_CLASS_UAV: case HLSL_CLASS_UAV:
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
return 1; return 1;
case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_EFFECT_GROUP:
@ -1090,6 +1102,9 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2
case HLSL_CLASS_STRING: case HLSL_CLASS_STRING:
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
case HLSL_CLASS_VOID: case HLSL_CLASS_VOID:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
return true; return true;
} }
@ -2512,6 +2527,9 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru
case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_TECHNIQUE:
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
case HLSL_CLASS_VOID: case HLSL_CLASS_VOID:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
break; break;
} }
@ -3861,6 +3879,9 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "STRING", HLSL_CLASS_STRING)); hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "STRING", HLSL_CLASS_STRING));
hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "texture", HLSL_CLASS_TEXTURE)); hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "texture", HLSL_CLASS_TEXTURE));
hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "vertexshader", HLSL_CLASS_VERTEX_SHADER)); hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "vertexshader", HLSL_CLASS_VERTEX_SHADER));
hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "ComputeShader", HLSL_CLASS_COMPUTE_SHADER));
hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "DomainShader", HLSL_CLASS_DOMAIN_SHADER));
hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "HullShader", HLSL_CLASS_HULL_SHADER));
for (i = 0; i < ARRAY_SIZE(effect_types); ++i) for (i = 0; i < ARRAY_SIZE(effect_types); ++i)
{ {

3
libs/vkd3d-shader/hlsl.h
View File

@ -91,6 +91,9 @@ enum hlsl_type_class
HLSL_CLASS_TEXTURE, HLSL_CLASS_TEXTURE,
HLSL_CLASS_UAV, HLSL_CLASS_UAV,
HLSL_CLASS_VERTEX_SHADER, HLSL_CLASS_VERTEX_SHADER,
HLSL_CLASS_COMPUTE_SHADER,
HLSL_CLASS_DOMAIN_SHADER,
HLSL_CLASS_HULL_SHADER,
HLSL_CLASS_CONSTANT_BUFFER, HLSL_CLASS_CONSTANT_BUFFER,
HLSL_CLASS_VOID, HLSL_CLASS_VOID,
}; };

12
libs/vkd3d-shader/hlsl.y
View File

@ -7368,6 +7368,18 @@ type_no_void:
{ {
$$ = hlsl_get_type(ctx->cur_scope, "PixelShader", true, true); $$ = hlsl_get_type(ctx->cur_scope, "PixelShader", true, true);
} }
| KW_COMPUTESHADER
{
$$ = hlsl_get_type(ctx->cur_scope, "ComputeShader", true, true);
}
| KW_DOMAINSHADER
{
$$ = hlsl_get_type(ctx->cur_scope, "DomainShader", true, true);
}
| KW_HULLSHADER
{
$$ = hlsl_get_type(ctx->cur_scope, "HullShader", true, true);
}
| KW_CONSTANTBUFFER '<' type '>' | KW_CONSTANTBUFFER '<' type '>'
{ {
if ($3->class != HLSL_CLASS_STRUCT) if ($3->class != HLSL_CLASS_STRUCT)

3
libs/vkd3d-shader/hlsl_codegen.c
View File

@ -1641,6 +1641,9 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx,
case HLSL_CLASS_TEXTURE: case HLSL_CLASS_TEXTURE:
case HLSL_CLASS_UAV: case HLSL_CLASS_UAV:
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
break; break;
case HLSL_CLASS_MATRIX: case HLSL_CLASS_MATRIX:

3
libs/vkd3d-shader/tpf.c
View File

@ -3002,6 +3002,9 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type)
case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VERTEX_SHADER:
case HLSL_CLASS_VOID: case HLSL_CLASS_VOID:
case HLSL_CLASS_CONSTANT_BUFFER: case HLSL_CLASS_CONSTANT_BUFFER:
case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER:
case HLSL_CLASS_HULL_SHADER:
break; break;
} }
vkd3d_unreachable(); vkd3d_unreachable();