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

Branch : - branch - main - tag -

• Show log

  Commit

• Author : Tim Van Patten
  Date : 2021-03-29 17:47:53
  Hash : 323c5f24
  Message : Validate PPO sampler uniforms "Command & Conquer: Rivals" uses PPOs and was hitting the following assert: angle::Result ContextVk::updateActiveTextures(const gl::Context *context) { ... for (size_t textureUnit : activeTextures) { gl::Texture *texture = textures[textureUnit]; gl::TextureType textureType = textureTypes[textureUnit]; ASSERT(textureType != gl::TextureType::InvalidEnum); This is the same assert that is generated by the test ProgramPipelineTest31.DifferentTextureTypes which is currently being skipped since it's known to fail. This CL refactors sampler validation into the ProgramExecutable to allow PPOs to take advantage of the shared code and behave correctly, since the necessary data is already copied into the PPO's ProgramExecutable via ProgramExecutable::updateActiveSamplers(). This also takes advantage of the subject/observer pattern that's already established between programs and PPOs to ensure only the PPOs that the program is a part of are updated when a program's sampler uniforms are updated. Bug: angleproject:3570 Bug: b/182409935 Test: ProgramPipelineTest31.DifferentTextureTypes Change-Id: I3d34efd66dc85e7ff23a8422cb14d5f90a5f7085 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2792862 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com>

• src/libANGLE/ProgramPipeline.h

• //
  // Copyright 2017 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.
  //
  
  // ProgramPipeline.h: Defines the gl::ProgramPipeline class.
  // Implements GL program pipeline objects and related functionality.
  // [OpenGL ES 3.1] section 7.4 page 105.
  
  #ifndef LIBANGLE_PROGRAMPIPELINE_H_
  #define LIBANGLE_PROGRAMPIPELINE_H_
  
  #include <memory>
  
  #include "common/angleutils.h"
  #include "libANGLE/Debug.h"
  #include "libANGLE/Program.h"
  #include "libANGLE/ProgramExecutable.h"
  #include "libANGLE/RefCountObject.h"
  
  namespace rx
  {
  class GLImplFactory;
  class ProgramPipelineImpl;
  }  // namespace rx
  
  namespace gl
  {
  class Context;
  class ProgramPipeline;
  
  class ProgramPipelineState final : angle::NonCopyable
  {
    public:
      ProgramPipelineState();
      ~ProgramPipelineState();
  
      const std::string &getLabel() const;
  
      const ProgramExecutable &getProgramExecutable() const
      {
          ASSERT(mExecutable);
          return *mExecutable;
      }
      ProgramExecutable &getProgramExecutable()
      {
          ASSERT(mExecutable);
          return *mExecutable;
      }
  
      void activeShaderProgram(Program *shaderProgram);
      void useProgramStages(const Context *context,
                            GLbitfield stages,
                            Program *shaderProgram,
                            std::vector<angle::ObserverBinding> *programObserverBindings);
  
      Program *getActiveShaderProgram() { return mActiveShaderProgram; }
  
      GLboolean isValid() const { return mValid; }
  
      const Program *getShaderProgram(ShaderType shaderType) const { return mPrograms[shaderType]; }
  
      bool usesShaderProgram(ShaderProgramID program) const;
  
      void updateExecutableTextures();
  
      rx::SpecConstUsageBits getSpecConstUsageBits() const;
  
    private:
      void useProgramStage(const Context *context,
                           ShaderType shaderType,
                           Program *shaderProgram,
                           angle::ObserverBinding *programObserverBindings);
  
      friend class ProgramPipeline;
  
      std::string mLabel;
  
      // The active shader program
      Program *mActiveShaderProgram;
      // The shader programs for each stage.
      ShaderMap<Program *> mPrograms;
  
      GLboolean mValid;
  
      ProgramExecutable *mExecutable;
  
      bool mIsLinked;
  };
  
  class ProgramPipeline final : public RefCountObject<ProgramPipelineID>,
                                public LabeledObject,
                                public angle::ObserverInterface,
                                public HasAttachedShaders
  {
    public:
      ProgramPipeline(rx::GLImplFactory *factory, ProgramPipelineID handle);
      ~ProgramPipeline() override;
  
      void onDestroy(const Context *context) override;
  
      void setLabel(const Context *context, const std::string &label) override;
      const std::string &getLabel() const override;
  
      const ProgramPipelineState &getState() const { return mState; }
      ProgramPipelineState &getState() { return mState; }
  
      const ProgramExecutable &getExecutable() const { return mState.getProgramExecutable(); }
      ProgramExecutable &getExecutable() { return mState.getProgramExecutable(); }
  
      rx::ProgramPipelineImpl *getImplementation() const;
  
      Program *getActiveShaderProgram() { return mState.getActiveShaderProgram(); }
      void activeShaderProgram(Program *shaderProgram);
      Program *getLinkedActiveShaderProgram(const Context *context)
      {
          Program *program = mState.getActiveShaderProgram();
          if (program)
          {
              program->resolveLink(context);
          }
          return program;
      }
  
      void useProgramStages(const Context *context, GLbitfield stages, Program *shaderProgram);
  
      Program *getShaderProgram(ShaderType shaderType) const { return mState.mPrograms[shaderType]; }
  
      void resetIsLinked() { mState.mIsLinked = false; }
      angle::Result link(const gl::Context *context);
      bool linkVaryings(InfoLog &infoLog) const;
      void validate(const gl::Context *context);
      GLboolean isValid() const { return mState.isValid(); }
  
      // ObserverInterface implementation.
      void onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message) override;
  
      // HasAttachedShaders implementation
      Shader *getAttachedShader(ShaderType shaderType) const override;
  
    private:
      void updateLinkedShaderStages();
      void updateExecutableAttributes();
      void updateTransformFeedbackMembers();
      void updateShaderStorageBlocks();
      void updateImageBindings();
      void updateExecutableGeometryProperties();
      void updateExecutableTessellationProperties();
      void updateFragmentInoutRange();
      void updateLinkedVaryings();
      void updateHasBooleans();
      void updateExecutable();
  
      std::unique_ptr<rx::ProgramPipelineImpl> mProgramPipelineImpl;
  
      ProgramPipelineState mState;
  
      std::vector<angle::ObserverBinding> mProgramObserverBindings;
      angle::ObserverBinding mExecutableObserverBinding;
  };
  }  // namespace gl
  
  #endif  // LIBANGLE_PROGRAMPIPELINE_H_