kc3-lang/angle/src/compiler/translator/spirv/TranslatorSPIRV.h

• Show log

  Commit

• Hash : c6fbf93d
  Author :
  Date : 2024-01-19T09:57:12
  

  Vulkan: Fix input attachments leaking into uniform list
  
  To communicate the existence of input attachments added to the shader,
  the translator was adding `ShaderVariable`s for each to the list of
  uniforms exported from the shader.  This was incorrect, as this list is
  visible to the application through `glGetActiveUniform`.  Additionally,
  this was unnecessarily causing these uniforms to go through program
  link.
  
  Reserving SPIR-V ids for these uniforms, all that is needed from the
  translator is the mere existence of these input attachments.  This
  change removes the addition of uniforms, and instead exports a bitset.
  Elsewhere, that bitset is consulted and reserved SPIR-V ids are used.
  
  Bug: b/320563594
  Bug: angleproject:5792
  Change-Id: Id93846cbc3996248f391fd2d5a65af1e48d6d46e
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5215089
  Reviewed-by: mohan maiya <m.maiya@samsung.com>
  Reviewed-by: Charlie Lao <cclao@google.com>
  Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
  

Download

• src/compiler/translator/spirv/TranslatorSPIRV.h

• //
  // Copyright 2016 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.
  //
  // TranslatorSPIRV:
  //   A set of transformations that prepare the AST to be compatible with GL_KHR_vulkan_glsl followed
  //   by a pass that generates SPIR-V.
  //   See: https://www.khronos.org/registry/vulkan/specs/misc/GL_KHR_vulkan_glsl.txt
  //
  
  #ifndef COMPILER_TRANSLATOR_SPIRV_TRANSLATORSPIRV_H_
  #define COMPILER_TRANSLATOR_SPIRV_TRANSLATORSPIRV_H_
  
  #include "compiler/translator/Compiler.h"
  
  namespace sh
  {
  
  class TOutputVulkanGLSL;
  class SpecConst;
  class DriverUniform;
  
  // An index -> TVariable map, tracking the declarated input attachments.
  using InputAttachmentMap = TUnorderedMap<uint32_t, const TVariable *>;
  
  class TranslatorSPIRV final : public TCompiler
  {
    public:
      TranslatorSPIRV(sh::GLenum type, ShShaderSpec spec);
  
      void assignSpirvId(TSymbolUniqueId uniqueId, uint32_t spirvId);
  
    protected:
      [[nodiscard]] bool translate(TIntermBlock *root,
                                   const ShCompileOptions &compileOptions,
                                   PerformanceDiagnostics *perfDiagnostics) override;
      bool shouldFlattenPragmaStdglInvariantAll() override;
  
      [[nodiscard]] bool translateImpl(TIntermBlock *root,
                                       const ShCompileOptions &compileOptions,
                                       PerformanceDiagnostics *perfDiagnostics,
                                       SpecConst *specConst,
                                       DriverUniform *driverUniforms);
      void assignInputAttachmentIds(const InputAttachmentMap &inputAttachmentMap);
      void assignSpirvIds(TIntermBlock *root);
  
      // A map from TSymbolUniqueId::mId to SPIR-V reserved ids.  Used by the SPIR-V generator to
      // quickly know when to use a reserved id and not have to resort to name matching.
      angle::HashMap<int, uint32_t> mUniqueToSpirvIdMap;
      uint32_t mFirstUnusedSpirvId;
  };
  
  }  // namespace sh
  
  #endif  // COMPILER_TRANSLATOR_SPIRV_TRANSLATORSPIRV_H_
  

Download