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

• Show log

  Commit

• Hash : 5e13757b
  Author :
  Date : 2020-05-11T00:50:00
  

  Metal: Fix array of structs containing array of samplers bug.
  
  Previously ProgramMtl could try to bind fixed slots to samplers based on
  layout (set=..., binding=...). However, GLSL layout model is different
  from Metal slots assignment. For example, The following is valid layout
  in GLSL:
  - array samplers A[2] is bound to index 0.
  - array samplers B[2] is bound to index 1.
  It is invalid to do so in Metal, since A occupies 2 slots, thus samplers
    B[2] must be bound to slots starting from 2.
  
  New binding method: let spirv-cross auto assigns the texture slots and
    retrieve them after compilation.
  
  Incomplete textures moved to ContextMtl using IncompleteTextureSet.
  
  New test added: GLSLTest.ArrayOfStructContainingArrayOfSamplers.
  
  Bug: angleproject:2634
  Change-Id: Ib0edaaf8b20512e1272c37c1d4b16a88a5b35e75
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2193193
  Commit-Queue: Jamie Madill <jmadill@chromium.org>
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
  

Download

• src/libANGLE/renderer/metal/DisplayMtl.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.
  //
  // DisplayMtl.h:
  //    Defines the class interface for DisplayMtl, implementing DisplayImpl.
  //
  
  #ifndef LIBANGLE_RENDERER_METAL_DISPLAYMTL_H_
  #define LIBANGLE_RENDERER_METAL_DISPLAYMTL_H_
  
  #include "common/PackedEnums.h"
  #include "libANGLE/angletypes.h"
  #include "libANGLE/renderer/DisplayImpl.h"
  #include "libANGLE/renderer/metal/mtl_command_buffer.h"
  #include "libANGLE/renderer/metal/mtl_format_utils.h"
  #include "libANGLE/renderer/metal/mtl_render_utils.h"
  #include "libANGLE/renderer/metal/mtl_state_cache.h"
  #include "libANGLE/renderer/metal/mtl_utils.h"
  #include "platform/FeaturesMtl.h"
  
  namespace egl
  {
  class Surface;
  }
  
  namespace rx
  {
  class ShareGroupMtl : public ShareGroupImpl
  {};
  
  class ContextMtl;
  
  class DisplayMtl : public DisplayImpl
  {
    public:
      DisplayMtl(const egl::DisplayState &state);
      ~DisplayMtl() override;
  
      egl::Error initialize(egl::Display *display) override;
      void terminate() override;
  
      bool testDeviceLost() override;
      egl::Error restoreLostDevice(const egl::Display *display) override;
  
      std::string getVendorString() const override;
  
      DeviceImpl *createDevice() override;
  
      egl::Error waitClient(const gl::Context *context) override;
      egl::Error waitNative(const gl::Context *context, EGLint engine) override;
  
      SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
                                       EGLNativeWindowType window,
                                       const egl::AttributeMap &attribs) override;
      SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
                                        const egl::AttributeMap &attribs) override;
      SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
                                                 EGLenum buftype,
                                                 EGLClientBuffer clientBuffer,
                                                 const egl::AttributeMap &attribs) override;
      SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
                                       NativePixmapType nativePixmap,
                                       const egl::AttributeMap &attribs) override;
  
      ImageImpl *createImage(const egl::ImageState &state,
                             const gl::Context *context,
                             EGLenum target,
                             const egl::AttributeMap &attribs) override;
  
      ContextImpl *createContext(const gl::State &state,
                                 gl::ErrorSet *errorSet,
                                 const egl::Config *configuration,
                                 const gl::Context *shareContext,
                                 const egl::AttributeMap &attribs) override;
  
      StreamProducerImpl *createStreamProducerD3DTexture(egl::Stream::ConsumerType consumerType,
                                                         const egl::AttributeMap &attribs) override;
  
      ShareGroupImpl *createShareGroup() override;
  
      gl::Version getMaxSupportedESVersion() const override;
      gl::Version getMaxConformantESVersion() const override;
  
      EGLSyncImpl *createSync(const egl::AttributeMap &attribs) override;
  
      egl::Error makeCurrent(egl::Surface *drawSurface,
                             egl::Surface *readSurface,
                             gl::Context *context) override;
  
      void populateFeatureList(angle::FeatureList *features) override;
  
      bool isValidNativeWindow(EGLNativeWindowType window) const override;
  
      egl::ConfigSet generateConfigs() override;
  
      std::string getRendererDescription() const;
      gl::Caps getNativeCaps() const;
      const gl::TextureCapsMap &getNativeTextureCaps() const;
      const gl::Extensions &getNativeExtensions() const;
      const gl::Limitations &getNativeLimitations() const { return mNativeLimitations; }
      const angle::FeaturesMtl &getFeatures() const { return mFeatures; }
  
      id<MTLDevice> getMetalDevice() const { return mMetalDevice; }
  
      mtl::CommandQueue &cmdQueue() { return mCmdQueue; }
      const mtl::FormatTable &getFormatTable() const { return mFormatTable; }
      mtl::RenderUtils &getUtils() { return mUtils; }
      mtl::StateCache &getStateCache() { return mStateCache; }
  
      id<MTLLibrary> getDefaultShadersLib() const { return mDefaultShaders; }
  
      id<MTLDepthStencilState> getDepthStencilState(const mtl::DepthStencilDesc &desc)
      {
          return mStateCache.getDepthStencilState(getMetalDevice(), desc);
      }
      id<MTLSamplerState> getSamplerState(const mtl::SamplerDesc &desc)
      {
          return mStateCache.getSamplerState(getMetalDevice(), desc);
      }
  
      const mtl::Format &getPixelFormat(angle::FormatID angleFormatId) const
      {
          return mFormatTable.getPixelFormat(angleFormatId);
      }
  
      // See mtl::FormatTable::getVertexFormat()
      const mtl::VertexFormat &getVertexFormat(angle::FormatID angleFormatId,
                                               bool tightlyPacked) const
      {
          return mFormatTable.getVertexFormat(angleFormatId, tightlyPacked);
      }
  
    protected:
      void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
      void generateCaps(egl::Caps *outCaps) const override;
  
    private:
      angle::Result initializeImpl(egl::Display *display);
      void ensureCapsInitialized() const;
      void initializeCaps() const;
      void initializeExtensions() const;
      void initializeTextureCaps() const;
      void initializeFeatures();
      angle::Result initializeShaderLibrary();
  
      mtl::AutoObjCPtr<id<MTLDevice>> mMetalDevice = nil;
  
      mtl::CommandQueue mCmdQueue;
  
      mtl::FormatTable mFormatTable;
      mtl::StateCache mStateCache;
      mtl::RenderUtils mUtils;
  
      // Built-in Shaders
      mtl::AutoObjCPtr<id<MTLLibrary>> mDefaultShaders = nil;
  
      mutable bool mCapsInitialized;
      mutable gl::TextureCapsMap mNativeTextureCaps;
      mutable gl::Extensions mNativeExtensions;
      mutable gl::Caps mNativeCaps;
      mutable gl::Limitations mNativeLimitations;
  
      angle::FeaturesMtl mFeatures;
  
      // track whether we initialized (or released) glslang
      bool mGlslangInitialized;
  };
  
  }  // namespace rx
  
  #endif /* LIBANGLE_RENDERER_METAL_DISPLAYMTL_H_ */
  

Download