diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c8b0d2..9dc5033 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ 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). +## [4.3.0-preview] - 2018-11-23 + ## [4.2.0-preview] - 2018-11-16 ### Added diff --git a/Editor/CoreEditorDrawers.cs b/Editor/CoreEditorDrawers.cs index 3a9f14b..5ae2a96 100644 --- a/Editor/CoreEditorDrawers.cs +++ b/Editor/CoreEditorDrawers.cs @@ -10,7 +10,7 @@ public enum FoldoutOption { None = 0, Indent = 1 << 0, - [Obsolete("animated inspector does not been approved by UX team")] + //[Obsolete("animated inspector does not been approved by UX team")] Animate = 1 << 1, Boxed = 1 << 2, SubFoldout = 1 << 3, @@ -18,7 +18,7 @@ public enum FoldoutOption } [Flags] - [Obsolete("Will disappear with CoreEditorDrawer")] + //[Obsolete("Will disappear with CoreEditorDrawer")] public enum FadeOption { None = 0, @@ -33,7 +33,7 @@ public enum GroupOption Indent = 1 << 0 } - [Obsolete("Prefer using the version without the UIState in coordination with a static ExpandedState")] + //[Obsolete("Prefer using the version without the UIState in coordination with a static ExpandedState")] public static class CoreEditorDrawer { public interface IDrawer @@ -685,7 +685,7 @@ void IDrawer.Draw(TData data, Editor o) public static class CoreEditorDrawersExtensions { - [Obsolete] + //[Obsolete] public static void Draw(this IEnumerable.IDrawer> drawers, TUIState s, TData p, Editor o) { foreach (var drawer in drawers) diff --git a/ShaderLibrary/API/XBoxOne.hlsl b/ShaderLibrary/API/XBoxOne.hlsl index 7c150a6..235f1b2 100644 --- a/ShaderLibrary/API/XBoxOne.hlsl +++ b/ShaderLibrary/API/XBoxOne.hlsl @@ -37,10 +37,6 @@ #define INTRINSIC_WAVEREADFIRSTLANE #define WaveReadLaneFirst __XB_MakeUniform -#define INTRINSIC_BITFIELD_EXTRACT -#define BitFieldExtract __XB_UBFE -#define INTRINSIC_BITFIELD_EXTRACT_SIGN_EXTEND -#define BitFieldExtractSignExtend __XB_IBFE #define INTRINSIC_BITFIELD_INSERT #define BitFieldInsert __XB_BFI #define INTRINSIC_BALLOT @@ -49,6 +45,19 @@ #define WaveActiveBitAnd __XB_WaveAND #define WaveActiveBitOr __XB_WaveOR + +#define INTRINSIC_BITFIELD_EXTRACT +uint BitFieldExtract(uint data, uint offset, uint numBits) +{ + return __XB_UBFE(numBits, offset, data); +} + +#define INTRINSIC_BITFIELD_EXTRACT_SIGN_EXTEND +int BitFieldExtractSignExtend(uint data, uint offset, uint numBits) +{ + return __XB_IBFE(numBits, offset, data); +} + #define INTRINSIC_WAVE_ACTIVE_ALL_ANY bool WaveActiveAllTrue(bool expression) { diff --git a/package.json b/package.json index 87f71dd..993a2a6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "description": "Helper library for SRP that contains a new Shader Library, and utility functions that can be used to implement a custom SRP. This library is currently used by both the High Definition Render Pipeline and the Lightweight Render Pipeline.", "displayName": "Core RP Library", - "gitHead": "fc353aa8874574ebf9de4d6d458a44c1c58e40eb", + "gitHead": "677b6ae9908f648fdee27573fb05a78c7a6cc7b4", "name": "com.unity.render-pipelines.core", "repoPackagePath": "com.unity.render-pipelines.core", "repository": { @@ -9,5 +9,5 @@ "url": "ssh://git@github.com/Unity-Technologies/ScriptableRenderLoop.git" }, "unity": "2018.3", - "version": "4.2.0-preview" + "version": "4.3.0-preview" } \ No newline at end of file