kc3-lang/angle/src/compiler/translator/blocklayout.h

• Show log

  Commit

• Hash : 3de2703d
  Author :
  Date : 2017-11-30T12:16:47
  

  Fix handling matrix qualifiers on block members
  
  Individual block member row_major/column_major layout qualifiers may
  override the qualifiers set on the block. During parsing, this was
  already being handled correctly, so that the qualifier is resolved for
  each block member and recorded for each TField / InterfaceBlockField.
  
  Now we always write the qualifiers on a per-member granularity to the
  output GLSL shaders, so that the native driver gets the correct
  per-member qualifiers. This replaces earlier behavior where the matrix
  qualifiers were only written per-block.
  
  Also only use qualifiers from individual members in block layout.
  
  Since the block-level qualifier information is no longer used after
  parsing, it is no longer kept in the AST. A dummy value is still set
  to the InterfaceBlock structs exposed through the ShaderVars
  interface, since that has existing usage in Chromium that needs to be
  removed before the field can be removed.
  
  Some AMD OpenGL drivers don't seem to handle matrix layout qualifiers
  correctly, so most of the added tests need to be skipped for AMD GL.
  On NVIDIA and Intel the tests pass.
  
  BUG=angleproject:2271
  TEST=angle_unittests, angle_end2end_tests,
       dEQP-GLES31.functional.program_interface_query.uniform.matrix*
  
  Change-Id: I1baa7a633bc2da548743c2190cb72db491b5227a
  Reviewed-on: https://chromium-review.googlesource.com/800174
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  Reviewed-by: Corentin Wallez <cwallez@chromium.org>
  Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
  

Download

• src/compiler/translator/blocklayout.h

• //
  // Copyright (c) 2013-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.
  //
  // blocklayout.h:
  //   Methods and classes related to uniform layout and packing in GLSL and HLSL.
  //
  
  #ifndef COMMON_BLOCKLAYOUT_H_
  #define COMMON_BLOCKLAYOUT_H_
  
  #include <cstddef>
  #include <map>
  #include <vector>
  
  #include "angle_gl.h"
  #include <GLSLANG/ShaderLang.h>
  
  namespace sh
  {
  struct ShaderVariable;
  struct InterfaceBlockField;
  struct Uniform;
  struct Varying;
  struct InterfaceBlock;
  
  struct BlockMemberInfo
  {
      BlockMemberInfo()
          : offset(-1),
            arrayStride(-1),
            matrixStride(-1),
            isRowMajorMatrix(false),
            topLevelArrayStride(-1)
      {
      }
  
      BlockMemberInfo(int offset, int arrayStride, int matrixStride, bool isRowMajorMatrix)
          : offset(offset),
            arrayStride(arrayStride),
            matrixStride(matrixStride),
            isRowMajorMatrix(isRowMajorMatrix),
            topLevelArrayStride(-1)
      {
      }
  
      BlockMemberInfo(int offset,
                      int arrayStride,
                      int matrixStride,
                      bool isRowMajorMatrix,
                      int topLevelArrayStride)
          : offset(offset),
            arrayStride(arrayStride),
            matrixStride(matrixStride),
            isRowMajorMatrix(isRowMajorMatrix),
            topLevelArrayStride(topLevelArrayStride)
      {
      }
  
      static BlockMemberInfo getDefaultBlockInfo() { return BlockMemberInfo(-1, -1, -1, false, -1); }
  
      int offset;
      int arrayStride;
      int matrixStride;
      bool isRowMajorMatrix;
      int topLevelArrayStride;  // Only used for shader storage block members.
  };
  
  class BlockLayoutEncoder
  {
    public:
      BlockLayoutEncoder();
      virtual ~BlockLayoutEncoder() {}
  
      BlockMemberInfo encodeType(GLenum type,
                                 const std::vector<unsigned int> &arraySizes,
                                 bool isRowMajorMatrix);
  
      size_t getBlockSize() const { return mCurrentOffset * BytesPerComponent; }
  
      virtual void enterAggregateType() = 0;
      virtual void exitAggregateType()  = 0;
  
      static const size_t BytesPerComponent           = 4u;
      static const unsigned int ComponentsPerRegister = 4u;
  
      static size_t getBlockRegister(const BlockMemberInfo &info);
      static size_t getBlockRegisterElement(const BlockMemberInfo &info);
  
    protected:
      size_t mCurrentOffset;
  
      void nextRegister();
  
      virtual void getBlockLayoutInfo(GLenum type,
                                      const std::vector<unsigned int> &arraySizes,
                                      bool isRowMajorMatrix,
                                      int *arrayStrideOut,
                                      int *matrixStrideOut) = 0;
      virtual void advanceOffset(GLenum type,
                                 const std::vector<unsigned int> &arraySizes,
                                 bool isRowMajorMatrix,
                                 int arrayStride,
                                 int matrixStride)          = 0;
  };
  
  // Block layout according to the std140 block layout
  // See "Standard Uniform Block Layout" in Section 2.11.6 of the OpenGL ES 3.0 specification
  
  class Std140BlockEncoder : public BlockLayoutEncoder
  {
    public:
      Std140BlockEncoder();
  
      void enterAggregateType() override;
      void exitAggregateType() override;
  
    protected:
      void getBlockLayoutInfo(GLenum type,
                              const std::vector<unsigned int> &arraySizes,
                              bool isRowMajorMatrix,
                              int *arrayStrideOut,
                              int *matrixStrideOut) override;
      void advanceOffset(GLenum type,
                         const std::vector<unsigned int> &arraySizes,
                         bool isRowMajorMatrix,
                         int arrayStride,
                         int matrixStride) override;
  };
  
  using BlockLayoutMap = std::map<std::string, BlockMemberInfo>;
  
  void GetUniformBlockInfo(const std::vector<InterfaceBlockField> &fields,
                           const std::string &prefix,
                           sh::BlockLayoutEncoder *encoder,
                           BlockLayoutMap *blockInfoOut);
  
  // Used for laying out the default uniform block on the Vulkan backend.
  void GetUniformBlockInfo(const std::vector<Uniform> &uniforms,
                           const std::string &prefix,
                           sh::BlockLayoutEncoder *encoder,
                           BlockLayoutMap *blockInfoOut);
  
  }  // namespace sh
  
  #endif  // COMMON_BLOCKLAYOUT_H_
  

Download