mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2024-11-21 16:46:41 -08:00
vkd3d-shader/hlsl: Add parser support for GeometryShader type.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
parent
de48960b33
commit
b23874dad6
Notes:
Henri Verbeet
2024-08-08 23:48:51 +02:00
Approved-by: Henri Verbeet (@hverbeet) Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/986
@ -1522,6 +1522,7 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type)
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1624,6 +1625,7 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type)
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -635,6 +635,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
put_u32_unaligned(buffer, 2);
|
put_u32_unaligned(buffer, 2);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -1076,6 +1077,7 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
case HLSL_CLASS_EFFECT_GROUP:
|
case HLSL_CLASS_EFFECT_GROUP:
|
||||||
|
@ -384,6 +384,7 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -457,6 +458,7 @@ static bool type_is_single_component(const struct hlsl_type *type)
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
case HLSL_CLASS_VECTOR:
|
case HLSL_CLASS_VECTOR:
|
||||||
@ -612,6 +614,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
VKD3D_ASSERT(idx == 0);
|
VKD3D_ASSERT(idx == 0);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -1015,6 +1018,7 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type)
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
case HLSL_CLASS_EFFECT_GROUP:
|
case HLSL_CLASS_EFFECT_GROUP:
|
||||||
@ -1105,6 +1109,7 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2556,6 +2561,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -3930,6 +3936,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx)
|
|||||||
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, "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, "DomainShader", HLSL_CLASS_DOMAIN_SHADER));
|
||||||
hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "HullShader", HLSL_CLASS_HULL_SHADER));
|
hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "HullShader", HLSL_CLASS_HULL_SHADER));
|
||||||
|
hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "GeometryShader", HLSL_CLASS_GEOMETRY_SHADER));
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(effect_types); ++i)
|
for (i = 0; i < ARRAY_SIZE(effect_types); ++i)
|
||||||
{
|
{
|
||||||
|
@ -94,6 +94,7 @@ enum hlsl_type_class
|
|||||||
HLSL_CLASS_COMPUTE_SHADER,
|
HLSL_CLASS_COMPUTE_SHADER,
|
||||||
HLSL_CLASS_DOMAIN_SHADER,
|
HLSL_CLASS_DOMAIN_SHADER,
|
||||||
HLSL_CLASS_HULL_SHADER,
|
HLSL_CLASS_HULL_SHADER,
|
||||||
|
HLSL_CLASS_GEOMETRY_SHADER,
|
||||||
HLSL_CLASS_CONSTANT_BUFFER,
|
HLSL_CLASS_CONSTANT_BUFFER,
|
||||||
HLSL_CLASS_VOID,
|
HLSL_CLASS_VOID,
|
||||||
};
|
};
|
||||||
|
@ -7418,6 +7418,10 @@ type_no_void:
|
|||||||
{
|
{
|
||||||
$$ = hlsl_get_type(ctx->cur_scope, "HullShader", true, true);
|
$$ = hlsl_get_type(ctx->cur_scope, "HullShader", true, true);
|
||||||
}
|
}
|
||||||
|
| KW_GEOMETRYSHADER
|
||||||
|
{
|
||||||
|
$$ = hlsl_get_type(ctx->cur_scope, "GeometryShader", true, true);
|
||||||
|
}
|
||||||
| KW_CONSTANTBUFFER '<' type '>'
|
| KW_CONSTANTBUFFER '<' type '>'
|
||||||
{
|
{
|
||||||
if ($3->class != HLSL_CLASS_STRUCT)
|
if ($3->class != HLSL_CLASS_STRUCT)
|
||||||
|
@ -1647,6 +1647,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx,
|
|||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
case HLSL_CLASS_RENDER_TARGET_VIEW:
|
case HLSL_CLASS_RENDER_TARGET_VIEW:
|
||||||
case HLSL_CLASS_DEPTH_STENCIL_VIEW:
|
case HLSL_CLASS_DEPTH_STENCIL_VIEW:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case HLSL_CLASS_MATRIX:
|
case HLSL_CLASS_MATRIX:
|
||||||
|
@ -3005,6 +3005,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type)
|
|||||||
case HLSL_CLASS_COMPUTE_SHADER:
|
case HLSL_CLASS_COMPUTE_SHADER:
|
||||||
case HLSL_CLASS_DOMAIN_SHADER:
|
case HLSL_CLASS_DOMAIN_SHADER:
|
||||||
case HLSL_CLASS_HULL_SHADER:
|
case HLSL_CLASS_HULL_SHADER:
|
||||||
|
case HLSL_CLASS_GEOMETRY_SHADER:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
vkd3d_unreachable();
|
vkd3d_unreachable();
|
||||||
|
Loading…
Reference in New Issue
Block a user