浏览代码

Fixing instance and semantic segmentation shaders in 2020.1. Bumping package version. Removing publish tests from all tests and renaming

/upgrade_deps
Jon Hogins 4 年前
当前提交
69018098
共有 6 个文件被更改,包括 58 次插入7 次删除
  1. 3
      .yamato/upm-ci-full.yml
  2. 4
      com.unity.perception/Runtime/GroundTruth/Resources/InstanceSegmentation.shader
  3. 3
      com.unity.perception/Runtime/GroundTruth/Resources/SemanticSegmentation.shader
  4. 2
      com.unity.perception/package.json
  5. 50
      com.unity.perception/Runtime/GroundTruth/Resources/Packing.hlsl
  6. 3
      com.unity.perception/Runtime/GroundTruth/Resources/Packing.hlsl.meta

3
.yamato/upm-ci-full.yml


{% endfor %}
all_tests:
name: All Tests
name: Complete Tests
agent:
type: Unity::VM
image: package-ci/win10:stable

{% for variant in package_variants %}
{% for editor in complete_editors %}
{% for platform in test_platforms %}
- .yamato/promote.yml#promotion_test_{{platform.name}}_{{editor.version}}
- .yamato/upm-ci-full.yml#pkg_test_{{variant.name}}_{{platform.name}}_{{editor.version}}
{% endfor %}
{% endfor %}

4
com.unity.perception/Runtime/GroundTruth/Resources/InstanceSegmentation.shader


#pragma vertex vert
#pragma fragment frag
#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl"
#include "UnityCG.cginc"
#include "Packing.hlsl"
struct appdata
{

3
com.unity.perception/Runtime/GroundTruth/Resources/SemanticSegmentation.shader


#pragma vertex vert
#pragma fragment frag
#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl"
#include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Packing.hlsl"
#include "UnityCG.cginc"
float4 LabelingId;

2
com.unity.perception/package.json


"displayName": "Perception",
"name": "com.unity.perception",
"unity": "2019.4",
"version": "0.3.0-preview.1"
"version": "0.4.0-preview.1"
}

50
com.unity.perception/Runtime/GroundTruth/Resources/Packing.hlsl


#ifndef UNITY_PERCEPTION_PACKING_INCLUDED
#define UNITY_PERCEPTION_PACKING_INCLUDED
#define real float
#define real2 float2
#define real3 float3
#define real4 float4
// Packs an integer stored using at most 'numBits' into a [0..1] real.
real PackInt(uint i, uint numBits)
{
uint maxInt = (1u << numBits) - 1u;
return saturate(i * rcp(maxInt));
}
// Unpacks a [0..1] real into an integer of size 'numBits'.
uint UnpackInt(real f, uint numBits)
{
uint maxInt = (1u << numBits) - 1u;
return (uint)(f * maxInt + 0.5); // Round instead of truncating
}
#ifndef INTRINSIC_BITFIELD_EXTRACT
// Unsigned integer bit field extraction.
// Note that the intrinsic itself generates a vector instruction.
// Wrap this function with WaveReadLaneFirst() to get scalar output.
uint BitFieldExtract(uint data, uint offset, uint numBits)
{
uint mask = (1u << numBits) - 1u;
return (data >> offset) & mask;
}
#endif // INTRINSIC_BITFIELD_EXTRACT
//-----------------------------------------------------------------------------
// Float packing
//-----------------------------------------------------------------------------
// src must be between 0.0 and 1.0
uint PackFloatToUInt(real src, uint offset, uint numBits)
{
return UnpackInt(src, numBits) << offset;
}
real UnpackUIntToFloat(uint src, uint offset, uint numBits)
{
uint maxInt = (1u << numBits) - 1u;
return real(BitFieldExtract(src, offset, numBits)) * rcp(maxInt);
}
#endif // UNITY_PACKING_INCLUDED

3
com.unity.perception/Runtime/GroundTruth/Resources/Packing.hlsl.meta


fileFormatVersion: 2
guid: 9af0f66010764cc5a8ef4acccc164cdb
timeCreated: 1598539851
正在加载...
取消
保存