kc3-lang/angle/src/libANGLE/Compiler.h

Branch : - branch - main - tag -

• Show log

  Commit

• Author : Jamie Madill
  Date : 2020-09-17 12:03:12
  Hash : f2749096
  Message : Fix racy global in gl::Compiler. We introduce a new Display Global Mutex in egl::Display that can guard access to gActiveCompilers in Compiler.cpp. Was detected by running MultithreadingTest against TSAN. Bug: b/168744561 Change-Id: I97866b60a173f60899cd0406fe0f71000035c0cf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2415181 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>

• src/libANGLE/Compiler.h

• //
  // Copyright 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.
  //
  
  // Compiler.h: Defines the gl::Compiler class, abstracting the ESSL compiler
  // that a GL context holds.
  
  #ifndef LIBANGLE_COMPILER_H_
  #define LIBANGLE_COMPILER_H_
  
  #include <vector>
  
  #include "GLSLANG/ShaderLang.h"
  #include "common/PackedEnums.h"
  #include "libANGLE/Error.h"
  #include "libANGLE/RefCountObject.h"
  
  namespace rx
  {
  class CompilerImpl;
  class GLImplFactory;
  }  // namespace rx
  
  namespace gl
  {
  class ShCompilerInstance;
  class State;
  
  class Compiler final : public RefCountObjectNoID
  {
    public:
      Compiler(rx::GLImplFactory *implFactory, const State &data, egl::Display *display);
  
      void onDestroy(const Context *context) override;
  
      ShCompilerInstance getInstance(ShaderType shaderType);
      void putInstance(ShCompilerInstance &&instance);
      ShShaderOutput getShaderOutputType() const { return mOutputType; }
  
    private:
      ~Compiler() override;
      std::unique_ptr<rx::CompilerImpl> mImplementation;
      ShShaderSpec mSpec;
      ShShaderOutput mOutputType;
      ShBuiltInResources mResources;
      ShaderMap<std::vector<ShCompilerInstance>> mPools;
  };
  
  class ShCompilerInstance final : public angle::NonCopyable
  {
    public:
      ShCompilerInstance();
      ShCompilerInstance(ShHandle handle, ShShaderOutput outputType, ShaderType shaderType);
      ~ShCompilerInstance();
      void destroy();
  
      ShCompilerInstance(ShCompilerInstance &&other);
      ShCompilerInstance &operator=(ShCompilerInstance &&other);
  
      ShHandle getHandle();
      ShaderType getShaderType() const;
      const std::string &getBuiltinResourcesString();
      ShShaderOutput getShaderOutputType() const;
  
    private:
      ShHandle mHandle;
      ShShaderOutput mOutputType;
      ShaderType mShaderType;
  };
  
  }  // namespace gl
  
  #endif  // LIBANGLE_COMPILER_H_