Skip to content
Snippets Groups Projects

vkd3d-shader/fx: Set GeometryShader state type as an object type.

Merged Nikolay Sivov requested to merge nsivov/vkd3d:fx_4_objtype_constant into master
2 files
+ 17
1
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 3
1
@@ -2366,6 +2366,7 @@ static inline bool is_object_fx_type(enum state_property_component_type type)
case FX_BLEND:
case FX_VERTEXSHADER:
case FX_PIXELSHADER:
case FX_GEOMETRYSHADER:
return true;
default:
return false;
@@ -2761,7 +2762,8 @@ static void resolve_fx_4_state_block_values(struct hlsl_ir_var *var, struct hlsl
struct hlsl_ir_constant *c = hlsl_ir_constant(node);
struct hlsl_type *data_type = c->node.data_type;
if (data_type->class == HLSL_CLASS_SCALAR && data_type->e.numeric.type == HLSL_TYPE_UINT)
if (data_type->class == HLSL_CLASS_SCALAR
&& (data_type->e.numeric.type == HLSL_TYPE_INT || data_type->e.numeric.type == HLSL_TYPE_UINT))
{
if (c->value.u[0].u != 0)
hlsl_error(ctx, &ctx->location, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
Loading