kc3-lang/angle/src/compiler/translator/DriverUniformMetal.cpp

• Show log

  Commit

• Hash : da3db87e
  Author :
  Date : 2021-07-06T14:00:58
  

  Upstream latest changes to Metal backend from Apple to 7/1/2021
  
  This CL merges in the ANGLE changes between these two WebKit commits:
  https://git.webkit.org/?p=WebKit.git;a=commit;h=8648b353ab1d7730438c2e08319e1a4d64982c31
  https://git.webkit.org/?p=WebKit.git;a=commit;h=166e4924a52971d6a32ad48247a439b16c00e062
  
  Include provoking vertex buffer out of bounds fix
  from https://bugs.webkit.org/show_bug.cgi?id=230107
  
  Fix bad merge of resetting of dirty bits, breaking
  DepthStencilFormatsTest.DepthTextureRender test and perhaps others.
  
  Disable GL_APPLE_clip_distance when the direct-to-Metal compiler is
  active. It can not yet handle the gl_ClipDistance array.
  
  Disable use of rectangular textures for IOSurfaces. Metal can bind
  IOSurfaces to 2D textures, and this was passing all tests in the
  SPIR-V Metal backend. Introducing rectangular textures breaks the
  SPIR-V Metal backend, and the tests currently fail on the
  direct-to-Metal backend.
  
  Fix several bugs with ProvokingVertex, which was causing
  both the SpirV and Direct backends to incorrectly draw
  indices.
  (https://bugs.webkit.org/show_bug.cgi?id=230107)
  
  Skip the following tests on the Metal backend which is still failing
    RobustResourceInitTestES3.BlitDepthStencilAfterClearBuffer
    GLSLTest_ES3.GLVertexIDIntegerTextureDrawArrays/ES3_Metal
  
  With these changes, angle_end2end_tests again runs to completion.
  
  Bug: angleproject:6395
  Change-Id: I3cc58f531426a95fc8f177a4ad87f56c1855a546
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3167010
  Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
  Reviewed-by: Kenneth Russell <kbr@chromium.org>
  Commit-Queue: Kyle Piddington <kpiddington@apple.com>
  

Download

• src/compiler/translator/DriverUniformMetal.cpp

• //
  // Copyright 2020 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.
  //
  // DriverUniformMetal:
  //   Struct defining the default driver uniforms for direct and SpirV based ANGLE translation
  //
  
  #include "compiler/translator/DriverUniformMetal.h"
  #include "compiler/translator/tree_util/BuiltIn.h"
  #include "compiler/translator/tree_util/DriverUniform.h"
  #include "compiler/translator/tree_util/IntermNode_util.h"
  
  namespace sh
  {
  
  namespace
  {
  
  // Metal specific driver uniforms
  constexpr const char kHalfRenderArea[]     = "halfRenderArea";
  constexpr const char kFlipXY[]             = "flipXY";
  constexpr const char kNegFlipXY[]          = "negFlipXY";
  constexpr const char kEmulatedInstanceID[] = "emulatedInstanceID";
  constexpr const char kCoverageMask[]       = "coverageMask";
  
  }  // namespace
  
  // class DriverUniformMetal
  // The fields here must match the DriverUniforms structure defined in ContextMtl.h.
  TFieldList *DriverUniformMetal::createUniformFields(TSymbolTable *symbolTable)
  {
      TFieldList *driverFieldList = DriverUniform::createUniformFields(symbolTable);
  
      constexpr size_t kNumGraphicsDriverUniformsMetal = 5;
      constexpr std::array<const char *, kNumGraphicsDriverUniformsMetal>
          kGraphicsDriverUniformNamesMetal = {
              {kHalfRenderArea, kFlipXY, kNegFlipXY, kEmulatedInstanceID, kCoverageMask}};
  
      const std::array<TType *, kNumGraphicsDriverUniformsMetal> kDriverUniformTypesMetal = {{
          new TType(EbtFloat, EbpHigh, EvqGlobal, 2),  // halfRenderArea
          new TType(EbtFloat, EbpLow, EvqGlobal, 2),   // flipXY
          new TType(EbtFloat, EbpLow, EvqGlobal, 2),   // negFlipXY
          new TType(EbtUInt, EbpHigh,
                    EvqGlobal),  // kEmulatedInstanceID - unused in SPIR-V Metal compiler
          new TType(EbtUInt, EbpHigh, EvqGlobal),  // kCoverageMask
      }};
  
      for (size_t uniformIndex = 0; uniformIndex < kNumGraphicsDriverUniformsMetal; ++uniformIndex)
      {
          TField *driverUniformField =
              new TField(kDriverUniformTypesMetal[uniformIndex],
                         ImmutableString(kGraphicsDriverUniformNamesMetal[uniformIndex]),
                         TSourceLoc(), SymbolType::AngleInternal);
          driverFieldList->push_back(driverUniformField);
      }
  
      return driverFieldList;
  }
  
  TIntermBinary *DriverUniformMetal::getHalfRenderAreaRef() const
  {
      return createDriverUniformRef(kHalfRenderArea);
  }
  
  TIntermBinary *DriverUniformMetal::getFlipXYRef() const
  {
      return createDriverUniformRef(kFlipXY);
  }
  
  TIntermBinary *DriverUniformMetal::getNegFlipXYRef() const
  {
      return createDriverUniformRef(kNegFlipXY);
  }
  
  TIntermSwizzle *DriverUniformMetal::getNegFlipYRef() const
  {
      // Create a swizzle to "negFlipXY.y"
      TIntermBinary *negFlipXY    = createDriverUniformRef(kNegFlipXY);
      TVector<int> swizzleOffsetY = {1};
      TIntermSwizzle *negFlipY    = new TIntermSwizzle(negFlipXY, swizzleOffsetY);
      return negFlipY;
  }
  
  TIntermBinary *DriverUniformMetal::getCoverageMaskFieldRef() const
  {
      return createDriverUniformRef(kCoverageMask);
  }
  
  }  // namespace sh
  

Download