kc3-lang/angle/src/compiler/translator/UtilsHLSL.h

• Show log

  Commit

• Hash : be59c2fb
  Author :
  Date : 2016-03-07T11:32:34
  

  Fix ambiguous function call issues in HLSL output
  
  D3D compiler can't resolve between these overloaded functions:
  
  float4 vec4(float2x2 x0);
  float4 vec4(float4 x0);
  
  Include the parameter types in the function name to disambiguate
  between overloaded user-defined functions and constructors, like this:
  
  float4 vec4_float2x2(float2x2 x0);
  float4 vec4_float4(float4 x0);
  
  This is only done for float2x2 and float4 parameters, other parameter
  types like float2x3 vs. float3x2 don't need this.
  
  BUG=angleproject:1099
  BUG=angleproject:1030
  TEST=angle_end2end_tests,
       dEQP-GLES3.functional.attribute_location.* (10 more tests pass),
       dEQP-GLES2.functional.attribute_location.*
  
  Change-Id: Ief047d41b0adbc238393c3c13cb29771cbb83d58
  Reviewed-on: https://chromium-review.googlesource.com/329882
  Reviewed-by: Corentin Wallez <cwallez@chromium.org>
  Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
  

Download

• src/compiler/translator/UtilsHLSL.h

• //
  // Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  //
  // UtilsHLSL.h:
  //   Utility methods for GLSL to HLSL translation.
  //
  
  #ifndef COMPILER_TRANSLATOR_UTILSHLSL_H_
  #define COMPILER_TRANSLATOR_UTILSHLSL_H_
  
  #include <vector>
  #include "compiler/translator/IntermNode.h"
  #include "compiler/translator/Types.h"
  
  #include "angle_gl.h"
  
  class TName;
  
  namespace sh
  {
  
  // Unique combinations of HLSL Texture type and HLSL Sampler type.
  enum HLSLTextureSamplerGroup
  {
      // Regular samplers
      HLSL_TEXTURE_2D,
      HLSL_TEXTURE_MIN = HLSL_TEXTURE_2D,
  
      HLSL_TEXTURE_CUBE,
      HLSL_TEXTURE_2D_ARRAY,
      HLSL_TEXTURE_3D,
      HLSL_TEXTURE_2D_INT4,
      HLSL_TEXTURE_3D_INT4,
      HLSL_TEXTURE_2D_ARRAY_INT4,
      HLSL_TEXTURE_2D_UINT4,
      HLSL_TEXTURE_3D_UINT4,
      HLSL_TEXTURE_2D_ARRAY_UINT4,
  
      // Comparison samplers
  
      HLSL_TEXTURE_2D_COMPARISON,
      HLSL_TEXTURE_CUBE_COMPARISON,
      HLSL_TEXTURE_2D_ARRAY_COMPARISON,
  
      HLSL_COMPARISON_SAMPLER_GROUP_BEGIN = HLSL_TEXTURE_2D_COMPARISON,
      HLSL_COMPARISON_SAMPLER_GROUP_END   = HLSL_TEXTURE_2D_ARRAY_COMPARISON,
  
      HLSL_TEXTURE_UNKNOWN,
      HLSL_TEXTURE_MAX = HLSL_TEXTURE_UNKNOWN
  };
  
  HLSLTextureSamplerGroup TextureGroup(const TBasicType type);
  TString TextureString(const HLSLTextureSamplerGroup type);
  TString TextureString(const TBasicType type);
  TString TextureGroupSuffix(const HLSLTextureSamplerGroup type);
  TString TextureGroupSuffix(const TBasicType type);
  TString TextureTypeSuffix(const TBasicType type);
  TString SamplerString(const TBasicType type);
  TString SamplerString(HLSLTextureSamplerGroup type);
  // Prepends an underscore to avoid naming clashes
  TString Decorate(const TString &string);
  TString DecorateIfNeeded(const TName &name);
  // Decorates and also unmangles the function name
  TString DecorateFunctionIfNeeded(const TName &name);
  TString DecorateUniform(const TString &string, const TType &type);
  TString DecorateField(const TString &string, const TStructure &structure);
  TString DecoratePrivate(const TString &privateText);
  TString TypeString(const TType &type);
  TString StructNameString(const TStructure &structure);
  TString QualifiedStructNameString(const TStructure &structure, bool useHLSLRowMajorPacking,
                                    bool useStd140Packing);
  TString InterpolationString(TQualifier qualifier);
  TString QualifierString(TQualifier qualifier);
  int HLSLTextureCoordsCount(const TBasicType samplerType);
  // Parameters may need to be included in function names to disambiguate between overloaded
  // functions.
  TString DisambiguateFunctionName(const TIntermSequence *parameters);
  }
  
  #endif // COMPILER_TRANSLATOR_UTILSHLSL_H_
  

Download