Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/upstream/v2' into v2
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre GAC committed Oct 18, 2019
2 parents 24e911c + bec8546 commit 1106e30
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .yamato/upm-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ test_platforms:
- name: win
type: Unity::VM
image: package-ci/win10:stable
flavor: m1.large
flavor: b1.large
- name: mac
type: Unity::VM::osx
image: buildfarm/mac:stable
Expand All @@ -15,7 +15,7 @@ pack:
agent:
type: Unity::VM
image: package-ci/win10:stable
flavor: m1.large
flavor: b1.large
commands:
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package pack
Expand Down Expand Up @@ -76,7 +76,7 @@ publish:
agent:
type: Unity::VM
image: package-ci/win10:stable
flavor: m1.large
flavor: b1.large
commands:
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
- upm-ci package publish
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ All notable changes to this package will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [2.1.8] - 2019-xx-xx
## [2.1.8] - 2019-10-11

### Added
- Support for dynamic resolution.
Expand Down
9 changes: 1 addition & 8 deletions PostProcessing/Runtime/PostProcessRenderContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,7 @@ public void PushDebugOverlay(CommandBuffer cmd, RenderTargetIdentifier source, P
// size usages explicit
#if UNITY_2017_2_OR_NEWER
RenderTextureDescriptor m_sourceDescriptor;
/// <summary>
/// Returns a modified copy the RenderTextureDescriptor used by the context object.
/// </summary>
/// <param name="depthBufferBits">The number of bits to use for the depth buffer</param>
/// <param name="colorFormat">The render texture format</param>
/// <param name="readWrite">The color space conversion mode</param>
/// <returns>A RenderTextureDescriptor object</returns>
public RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default)
internal RenderTextureDescriptor GetDescriptor(int depthBufferBits = 0, RenderTextureFormat colorFormat = RenderTextureFormat.Default, RenderTextureReadWrite readWrite = RenderTextureReadWrite.Default)
{
var modifiedDesc = new RenderTextureDescriptor(m_sourceDescriptor.width, m_sourceDescriptor.height,
m_sourceDescriptor.colorFormat, depthBufferBits);
Expand Down

0 comments on commit 1106e30

Please sign in to comment.