kc3-lang/angle/src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.h

• Show log

  Commit

• Hash : 54d4bfe5
  Author :
  Date : 2021-09-28T17:27:57
  

  Update ANGLE Metal to Webkit at Sept 29 2021
  
  This commit merges changes from Webkit into ANGLE upstream.
  The following commits were used:
  Current:
  https://git.webkit.org/?p=WebKit.git;a=commit;h=e01d0bda8f4b7dc2fd834b92802d15d8c15735f
  
  Previous:
  https://git.webkit.org/?p=WebKit.git;a=commit;h=492f078198748e8ff248eea0bb979cf79e5f5adfj
  
  The following commits were merged in from the Webkit Repository:
  (Hashes from git://git.webkit.org/WebKit-https.git)
  
  03ea44c78ce5665d4ec9add271260121cbc7bc6c
       Problems with drawElements in some conditions
       https://bugs.webkit.org/show_bug.cgi?id=230107
  c8dc8e0c4d1109d39a62eb197b45e95132380290
       ANGLE Metal: single-component swizzles do not compile
       https://bugs.webkit.org/show_bug.cgi?id=230472
  7285dbaaf5af15877d6c332b30ef7a4d67225460
       webgl-compressed-texture-s3tc-srgb.html fails on Intel+AMD Metal
       https://bugs.webkit.org/show_bug.cgi?id=229941
  4c72f92967ecd2a095666fef431384c4f5f60fb4
       fragcolor-fragdata-invariant.html fails
       https://bugs.webkit.org/show_bug.cgi?id=223317
  cd943145467f54e5928793c0dd3dfa2313c007dd
       ANGLE Metal index buffer restart range cache could be maintained..
       https://bugs.webkit.org/show_bug.cgi?id=227451
  f075ff77e592eabd54dd659a8e13617cc5faedc8
       ANGLE Metal infinities and NaNs generated with incorrect syntax
       https://bugs.webkit.org/show_bug.cgi?id=229439
  5862073269122f4b2d43d96d3922757557755e86
       [Metal ANGLE] Fix over-autorelease of
       rx::DisplayMtl::getMetalDeviceMatchingAttribute()...
       <https://webkit.org/b/229128>
  85f797ad31db048cb82cbafd428ef77f0b839312 ANGLE Cocoa compiles....
       https://bugs.webkit.org/show_bug.cgi?id=228987
  a67918ba279ad4842b6ae84a79c3f1c0cdc35ace Avoid infinite recursion...
       https://bugs.webkit.org/show_bug.cgi?id=228978
  d341f67de0033adcf1ec6373ace6a54b06c4a031
       Cherry-pick ANGLE: Revise WebGL's shaderSource validation
       https://bugs.webkit.org/show_bug.cgi?id=228951
  1e2714d981e97de8234ba055570dfdf56e8b6944
       3.5 MB system-wide footprint impact due to thread-locals...
       https://bugs.webkit.org/show_bug.cgi?id=228240
  d32e5cca34081997d32504b0b56c18b9703ff3be
       Build Default Metal library offline
       https://bugs.webkit.org/show_bug.cgi?id=227333
  33702279faccfd4c8d1c8a6d549925f9ca9a4e8f
       WebGL2 demo doesn't work due to failing compilation....
       https://bugs.webkit.org/show_bug.cgi?id=226865
  0a075885d242db38c4e435a6597173dc3b082173
       rAF driven WebGL submits excessive amount of GPU work...
       https://bugs.webkit.org/show_bug.cgi?id=227059
  f38a92b3e7c17efda269caa7066e7ffe2f828e72
       WebGL shader link error in iOS 15 beta: "Internal error..."
       https://bugs.webkit.org/show_bug.cgi?id=227723
  98d48f011d561531470d97f26a022767b5452fb7
       REGRESSION (r279466):  [Big Sur] webgl/1.0.3/conformance &...
       https://bugs.webkit.org/show_bug.cgi?id=227596
  
  Bug: angleproject:6471
  Change-Id: I07166d0dc4b5c3579d98353485b3245b81c7b882
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3194322
  Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
  Reviewed-by: Kenneth Russell <kbr@chromium.org>
  Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
  Commit-Queue: Kyle Piddington <kpiddington@apple.com>
  

Download

• src/libANGLE/renderer/metal/mtl_glslang_mtl_utils.h

• //
  // Copyright 2019 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.
  //
  // mtl_glslang_mtl_utils.h: Wrapper for Khronos's glslang compiler for MSL.
  //
  
  #ifndef mtl_glslang_mtl_utils_h
  #define mtl_glslang_mtl_utils_h
  #include "libANGLE/Context.h"
  #include "libANGLE/renderer/ProgramImpl.h"
  #include "libANGLE/renderer/glslang_wrapper_utils.h"
  #include "libANGLE/renderer/metal/mtl_common.h"
  
  namespace rx
  {
  namespace mtl
  {
  struct SamplerBinding
  {
      uint32_t textureBinding = 0;
      uint32_t samplerBinding = 0;
  };
  
  struct TranslatedShaderInfo
  {
      void reset();
      // Translated Metal source code
      std::string metalShaderSource;
      // Metal library compiled from source code above. Used by ProgramMtl.
      AutoObjCPtr<id<MTLLibrary>> metalLibrary;
      std::array<SamplerBinding, kMaxGLSamplerBindings> actualSamplerBindings;
      std::array<uint32_t, kMaxGLUBOBindings> actualUBOBindings;
      std::array<uint32_t, kMaxShaderXFBs> actualXFBBindings;
      bool hasUBOArgumentBuffer;
      bool hasInvariantOrAtan;
  };
  void MSLGetShaderSource(const gl::ProgramState &programState,
                          const gl::ProgramLinkedResources &resources,
                          gl::ShaderMap<std::string> *shaderSourcesOut,
                          ShaderInterfaceVariableInfoMap *variableInfoMapOut);
  
  angle::Result GlslangGetMSL(const gl::Context *glContext,
                              const gl::ProgramState &programState,
                              const gl::Caps &glCaps,
                              const gl::ShaderMap<std::string> &shaderSources,
                              const ShaderInterfaceVariableInfoMap &variableInfoMap,
                              gl::ShaderMap<TranslatedShaderInfo> *mslShaderInfoOut,
                              gl::ShaderMap<std::string> *mslCodeOut,
                              size_t xfbBufferCount);
  
  // Get equivalent shadow compare mode that is used in translated msl shader.
  uint MslGetShaderShadowCompareMode(GLenum mode, GLenum func);
  
  }  // namespace mtl
  }  // namespace rx
  
  #endif /* mtl_glslang_mtl_utils_h */
  

Download