kc3-lang/angle/src/compiler/translator/ShaderVars.cpp

• Show log

  Commit

• Hash : a6f267f9
  Author :
  Date : 2014-08-27T11:44:15
  

  Fix row-major layout tracking in interface blocks.
  
  Some block field types, such as nested structs, were bugged. This
  only affects our "CollectVariables" path, not our current HLSL
  UBO path.
  
  BUG=angle:466
  
  Change-Id: I2b8daf58aa7ec1ad06a80d38f57e76087eacccdc
  Reviewed-on: https://chromium-review.googlesource.com/213503
  Tested-by: Jamie Madill <jmadill@chromium.org>
  Reviewed-by: Nicolas Capens <capn@chromium.org>
  

Download

• src/compiler/translator/ShaderVars.cpp

• //
  // Copyright (c) 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.
  //
  // ShaderVars.cpp:
  //  Methods for GL variable types (varyings, uniforms, etc)
  //
  
  #include <GLSLANG/ShaderLang.h>
  
  namespace sh
  {
  
  ShaderVariable::ShaderVariable()
      : type(0),
        precision(0),
        arraySize(0),
        staticUse(false)
  {}
  
  ShaderVariable::ShaderVariable(GLenum typeIn, unsigned int arraySizeIn)
      : type(typeIn),
        precision(0),
        arraySize(arraySizeIn),
        staticUse(false)
  {}
  
  ShaderVariable::~ShaderVariable()
  {}
  
  ShaderVariable::ShaderVariable(const ShaderVariable &other)
      : type(other.type),
        precision(other.precision),
        name(other.name),
        mappedName(other.mappedName),
        arraySize(other.arraySize),
        staticUse(other.staticUse),
        fields(other.fields),
        structName(other.structName)
  {}
  
  ShaderVariable &ShaderVariable::operator=(const ShaderVariable &other)
  {
      type = other.type;
      precision = other.precision;
      name = other.name;
      mappedName = other.mappedName;
      arraySize = other.arraySize;
      staticUse = other.staticUse;
      fields = other.fields;
      structName = other.structName;
      return *this;
  }
  
  Uniform::Uniform()
  {}
  
  Uniform::~Uniform()
  {}
  
  Uniform::Uniform(const Uniform &other)
      : ShaderVariable(other)
  {}
  
  Uniform &Uniform::operator=(const Uniform &other)
  {
      ShaderVariable::operator=(other);
      return *this;
  }
  
  Attribute::Attribute()
      : location(-1)
  {}
  
  Attribute::~Attribute()
  {}
  
  Attribute::Attribute(const Attribute &other)
      : ShaderVariable(other),
        location(other.location)
  {}
  
  Attribute &Attribute::operator=(const Attribute &other)
  {
      ShaderVariable::operator=(other);
      location = other.location;
      return *this;
  }
  
  InterfaceBlockField::InterfaceBlockField()
      : isRowMajorLayout(false)
  {}
  
  InterfaceBlockField::~InterfaceBlockField()
  {}
  
  InterfaceBlockField::InterfaceBlockField(const InterfaceBlockField &other)
      : ShaderVariable(other),
        isRowMajorLayout(other.isRowMajorLayout)
  {}
  
  InterfaceBlockField &InterfaceBlockField::operator=(const InterfaceBlockField &other)
  {
      ShaderVariable::operator=(other);
      isRowMajorLayout = other.isRowMajorLayout;
      return *this;
  }
  
  Varying::Varying()
      : interpolation(INTERPOLATION_SMOOTH),
        isInvariant(false)
  {}
  
  Varying::~Varying()
  {}
  
  Varying::Varying(const Varying &other)
      : ShaderVariable(other),
        interpolation(other.interpolation),
        isInvariant(other.isInvariant)
  {}
  
  Varying &Varying::operator=(const Varying &other)
  {
      ShaderVariable::operator=(other);
      interpolation = other.interpolation;
      isInvariant = other.isInvariant;
      return *this;
  }
  
  InterfaceBlock::InterfaceBlock()
      : arraySize(0),
        layout(BLOCKLAYOUT_PACKED),
        isRowMajorLayout(false),
        staticUse(false)
  {}
  
  InterfaceBlock::~InterfaceBlock()
  {}
  
  InterfaceBlock::InterfaceBlock(const InterfaceBlock &other)
      : name(other.name),
        mappedName(other.mappedName),
        instanceName(other.instanceName),
        arraySize(other.arraySize),
        layout(other.layout),
        isRowMajorLayout(other.isRowMajorLayout),
        staticUse(other.staticUse),
        fields(other.fields)
  {}
  
  InterfaceBlock &InterfaceBlock::operator=(const InterfaceBlock &other)
  {
      name = other.name;
      mappedName = other.mappedName;
      instanceName = other.instanceName;
      arraySize = other.arraySize;
      layout = other.layout;
      isRowMajorLayout = other.isRowMajorLayout;
      staticUse = other.staticUse;
      fields = other.fields;
      return *this;
  }
  
  }
  

Download