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

• Show log

  Commit

• Hash : d1434c04
  Author :
  Date : 2018-01-29T02:29:53
  

  Revert "Use ImmutableString for HLSL texture references"
  
  This reverts commit c13bda8678e86ff75a4acfc94f7a45e58224926d.
  
  Reason for revert: May have broken LibFuzzer and AFL builds:
  
  https://ci.chromium.org/buildbot/chromium.fyi/Afl%20Upload%20Linux%20ASan/7718
  https://build.chromium.org/deprecated/chromium.fyi/builders/Libfuzzer%20Upload%20Linux%20ASan/builds/8691
  
  In file included from ../../third_party/angle/src/compiler/translator/TextureFunctionHLSL.cpp:12:
  In file included from ../../third_party/angle/src/compiler/translator/TextureFunctionHLSL.h:19:
  ../../third_party/angle/src/compiler/translator/InfoSink.h:40:16: error: call to function 'operator<<' that is neither visible in the template definition nor found by argument-dependent lookup
          stream << t;
                 ^
  ../../third_party/angle/src/compiler/translator/TextureFunctionHLSL.cpp:111:9: note: in instantiation of function template specialization 'sh::TInfoSinkBase::operator<<<sh::ImmutableString>' requested here
      out << textureReference;
          ^
  ../../third_party/angle/src/compiler/translator/ImmutableString.h:76:15: note: 'operator<<' should be declared prior to the call site or in namespace 'sh'
  std::ostream &operator<<(std::ostream &os, const sh::ImmutableString &str);
                ^
  1 error generated.
  
  Bug: chromium:806619
  
  Original change's description:
  > Use ImmutableString for HLSL texture references
  > 
  > This also adds ImmutableStringBuilder class, which can be used to
  > build ImmutableStrings in place without extra allocations if the
  > maximum length is known in advance.
  > 
  > BUG=angleproject:2267
  > TEST=angle_unittests
  > 
  > Change-Id: I4dfb78adeb0cffcfad0d25753fb8063466012c92
  > Reviewed-on: https://chromium-review.googlesource.com/886362
  > Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
  > Reviewed-by: Jamie Madill <jmadill@chromium.org>
  
  TBR=jmadill@chromium.org,cwallez@chromium.org,oetuaho@nvidia.com
  
  # Not skipping CQ checks because original CL landed > 1 day ago.
  
  Bug: angleproject:2267
  Change-Id: I445f5a786f8b16c3f40f28df09d45fcb215a9c88
  Reviewed-on: https://chromium-review.googlesource.com/890542
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Commit-Queue: Jamie Madill <jmadill@chromium.org>
  

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"
  
  namespace sh
  {
  
  // HLSL Texture type for GLSL sampler type and readonly image type.
  enum HLSLTextureGroup
  {
      // read resources
      HLSL_TEXTURE_2D,
      HLSL_TEXTURE_MIN = HLSL_TEXTURE_2D,
  
      HLSL_TEXTURE_CUBE,
      HLSL_TEXTURE_2D_ARRAY,
      HLSL_TEXTURE_3D,
      HLSL_TEXTURE_2D_UNORM,
      HLSL_TEXTURE_CUBE_UNORM,
      HLSL_TEXTURE_2D_ARRAY_UNORN,
      HLSL_TEXTURE_3D_UNORM,
      HLSL_TEXTURE_2D_SNORM,
      HLSL_TEXTURE_CUBE_SNORM,
      HLSL_TEXTURE_2D_ARRAY_SNORM,
      HLSL_TEXTURE_3D_SNORM,
      HLSL_TEXTURE_2D_MS,
      HLSL_TEXTURE_2D_INT4,
      HLSL_TEXTURE_3D_INT4,
      HLSL_TEXTURE_2D_ARRAY_INT4,
      HLSL_TEXTURE_2D_MS_INT4,
      HLSL_TEXTURE_2D_UINT4,
      HLSL_TEXTURE_3D_UINT4,
      HLSL_TEXTURE_2D_ARRAY_UINT4,
      HLSL_TEXTURE_2D_MS_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
  };
  
  // HLSL RWTexture type for GLSL read and write image type.
  enum HLSLRWTextureGroup
  {
      // read/write resource
      HLSL_RWTEXTURE_2D_FLOAT4,
      HLSL_RWTEXTURE_MIN = HLSL_RWTEXTURE_2D_FLOAT4,
      HLSL_RWTEXTURE_2D_ARRAY_FLOAT4,
      HLSL_RWTEXTURE_3D_FLOAT4,
      HLSL_RWTEXTURE_2D_UNORM,
      HLSL_RWTEXTURE_2D_ARRAY_UNORN,
      HLSL_RWTEXTURE_3D_UNORM,
      HLSL_RWTEXTURE_2D_SNORM,
      HLSL_RWTEXTURE_2D_ARRAY_SNORM,
      HLSL_RWTEXTURE_3D_SNORM,
      HLSL_RWTEXTURE_2D_UINT4,
      HLSL_RWTEXTURE_2D_ARRAY_UINT4,
      HLSL_RWTEXTURE_3D_UINT4,
      HLSL_RWTEXTURE_2D_INT4,
      HLSL_RWTEXTURE_2D_ARRAY_INT4,
      HLSL_RWTEXTURE_3D_INT4,
  
      HLSL_RWTEXTURE_UNKNOWN,
      HLSL_RWTEXTURE_MAX = HLSL_RWTEXTURE_UNKNOWN
  };
  
  HLSLTextureGroup TextureGroup(const TBasicType type,
                                TLayoutImageInternalFormat imageInternalFormat = EiifUnspecified);
  TString TextureString(const HLSLTextureGroup textureGroup);
  TString TextureString(const TBasicType type,
                        TLayoutImageInternalFormat imageInternalFormat = EiifUnspecified);
  TString TextureGroupSuffix(const HLSLTextureGroup type);
  TString TextureGroupSuffix(const TBasicType type,
                             TLayoutImageInternalFormat imageInternalFormat = EiifUnspecified);
  TString TextureTypeSuffix(const TBasicType type,
                            TLayoutImageInternalFormat imageInternalFormat = EiifUnspecified);
  HLSLRWTextureGroup RWTextureGroup(const TBasicType type,
                                    TLayoutImageInternalFormat imageInternalFormat);
  TString RWTextureString(const HLSLRWTextureGroup textureGroup);
  TString RWTextureString(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat);
  TString RWTextureGroupSuffix(const HLSLRWTextureGroup type);
  TString RWTextureGroupSuffix(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat);
  TString RWTextureTypeSuffix(const TBasicType type, TLayoutImageInternalFormat imageInternalFormat);
  
  TString SamplerString(const TBasicType type);
  TString SamplerString(HLSLTextureGroup type);
  
  // Adds a prefix to user-defined names to avoid naming clashes.
  TString Decorate(const TString &string);
  TString DecorateVariableIfNeeded(const TVariable &variable);
  TString DecorateFunctionIfNeeded(const TFunction *func);
  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);
  // 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