Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Per-stage shader keywords in HDRP #2996

Merged
merged 22 commits into from
Jan 18, 2021
Merged

Per-stage shader keywords in HDRP #2996

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a689936
Lit _fragment
FrancescoC-unity May 22, 2020
a6bb0f9
shadergraph and others
FrancescoC-unity May 22, 2020
759f0fd
some wrong changes
FrancescoC-unity May 22, 2020
6bdcfc0
fixup multiple feature
FrancescoC-unity May 22, 2020
e52293d
Merge branch 'master' into HDRP/shader-features-frequency
FrancescoC-unity Nov 13, 2020
31c104b
Some more (probably something's broken)
FrancescoC-unity Nov 20, 2020
05a4a68
Conservative fixes [Need going through changes a bit]
FrancescoC-unity Nov 23, 2020
c426952
Conservative working
FrancescoC-unity Nov 24, 2020
f56fb25
Fix SG and raytracing
FrancescoC-unity Nov 24, 2020
705aa92
More changes
FrancescoC-unity Nov 24, 2020
a37996f
Fixup unlit test issues
FrancescoC-unity Nov 24, 2020
3bcea1a
Fix tessellation test
FrancescoC-unity Nov 24, 2020
2b5d41b
Merge branch 'master' into HDRP/shader-features-frequency
FrancescoC-unity Jan 6, 2021
1d3a499
changelog
FrancescoC-unity Jan 6, 2021
bc4f58d
Remove obsolete comment.
FrancescoC-unity Jan 7, 2021
e9bb4e8
Merge branch 'master' into HDRP/shader-features-frequency
sebastienlagarde Jan 14, 2021
2f4b350
add support for probe volume fragment
sebastienlagarde Jan 14, 2021
6662591
Fix emissive color map on unlit ray tracing
FrancescoC-unity Jan 15, 2021
e68928f
fix probe volume to use FragmentAndRaytracing
sebastienlagarde Jan 15, 2021
e546d17
Formatting
sebastienlagarde Jan 15, 2021
7658cf5
Fix D3D12 mismatching VS to PS input structs
FrancescoC-unity Jan 15, 2021
196eeca
Fix terrain on d3d12
FrancescoC-unity Jan 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove obsolete comment.
  • Loading branch information
@FrancescoC-unity
FrancescoC-unity committed Jan 7, 2021
commit bc4f58da8e71d5e7f310ce711bddddd404fd2a5d
1 change: 0 additions & 1 deletion com.unity.shadergraph/Editor/Data/Util/KeywordUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ public static bool NeedsMultiStageDefinition(this KeywordDescriptor keyword, ref

}

// TODO: BROKEN FIX!!!!
public static string ToKeywordStagesString(this KeywordShaderStage stages)
{
string outString = "";
Expand Down