Re: [PATCH v9 0/7] MR320: vkd3d-shader/dxil: Implement DX instruction LoadInput.

[Conor McCarthy (＠cmccarthy)]

On Mon Sep 25 13:33:10 2023 +0000, Henri Verbeet wrote:
> > @@ -43,16 +43,12 @@ static inline enum vkd3d_result
>
> vkd3d_shader_parse_dxbc_source_type(const struct
> >      if (tag == TAG_SHDR || tag == TAG_SHEX)
> >      {
> >          *type = VKD3D_SHADER_SOURCE_DXBC_TPF;
> >
> > -#ifndef VKD3D_SHADER_UNSUPPORTED_DXIL
> > -
> >        break;
> >
> > -#else
> >          }
> >          else if (tag == TAG_DXIL)
> >          {
> >              *type = VKD3D_SHADER_SOURCE_DXBC_DXIL;
> >              /* Default to DXIL if both are present. */
> >              break;
> > -#endif
> >          }
> >      }
> >  ...
> > @@ -2940,8 +3031,6 @@ int vkd3d_shader_sm6_parser_create(const struct
>
> vkd3d_shader_compile_info *compi
> >  struct sm6_parser *sm6;
> >  int ret;
> >
> > - ERR("Creating a DXIL parser. This is unsupported; you get to keep
>
> all the pieces if it breaks.\n");
> > - if (!(sm6 = vkd3d_calloc(1, sizeof(*sm6))))
> >    {
> >        ERR("Failed to allocate parser.\n");
> >
> > ...
> > @@ -1667,9 +1667,7 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns
> >          VKD3D_SHADER_SOURCE_DXBC_TPF,
> >          VKD3D_SHADER_SOURCE_HLSL,
> >          VKD3D_SHADER_SOURCE_D3D_BYTECODE,
> > -#ifdef VKD3D_SHADER_UNSUPPORTED_DXIL
> >          VKD3D_SHADER_SOURCE_DXBC_DXIL,
> > -#endif
> >      };
> >  TRACE("count %p.\n", count);
> >
> > @@ -1708,9 +1706,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types(
> >  switch (source_type)
> >  {
> >
> > -#ifdef VKD3D_SHADER_UNSUPPORTED_DXIL
> >          case VKD3D_SHADER_SOURCE_DXBC_DXIL:
> > -#endif
> >          case VKD3D_SHADER_SOURCE_DXBC_TPF:
> >              *count = ARRAY_SIZE(dxbc_tpf_types);
> >              return dxbc_tpf_types;
>
> Why are you removing these?

I thought it was just for the 1.9 release, since some of the DXIL code has been upstream for a while.