Skip to content

7.x.x/universal/additional fixes #652

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

Merged
merged 2 commits into from
May 28, 2020
Merged

7.x.x/universal/additional fixes #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
908ba09
Fix material editor issue that causes transparents to have wrong ren…
phi-lira May 28, 2020
65b6929
Fixed GL Core shader error in Bokeh DoF shader.
phi-lira May 28, 2020
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
1 change: 1 addition & 0 deletions com.unity.render-pipelines.universal/Editor/ShaderGUI/BaseShaderGUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ public static void SetupMaterialBlendMode(Material material)
// General Transparent Material Settings
material.SetOverrideTag("RenderType", "Transparent");
material.SetInt("_ZWrite", 0);
material.renderQueue = (int)RenderQueue.Transparent;
material.renderQueue += material.HasProperty("_QueueOffset") ? (int) material.GetFloat("_QueueOffset") : 0;
material.SetShaderPassEnabled("ShadowCaster", false);
}
Expand Down
10 changes: 8 additions & 2 deletions com.unity.render-pipelines.universal/Shaders/PostProcessing/BokehDepthOfField.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@ Shader "Hidden/Universal Render Pipeline/BokehDepthOfField"

uint w;
uint h;
#if defined(UNITY_STEREO_INSTANCING_ENABLED) || defined(UNITY_STEREO_MULTIVIEW_ENABLED)
#if defined(SHADER_API_GLCORE)
// GetDimensions will use textureQueryLevels in OpenGL and that's not
// supported in OpenGL 4.1 or below. In that case we use _MainTex_TexelSize
// which is fine as we don't support dynamic scaling in OpenGL.
w = _MainTex_TexelSize.z;
h = _MainTex_TexelSize.w;
#elif defined(UNITY_STEREO_INSTANCING_ENABLED) || defined(UNITY_STEREO_MULTIVIEW_ENABLED)
uint x;
_CameraDepthTexture.GetDimensions(w, h, x);
#else
Expand Down Expand Up @@ -305,7 +311,7 @@ Shader "Hidden/Universal Render Pipeline/BokehDepthOfField"
// SM3.5 fallbacks - needed because of the use of Gather
SubShader
{
Tags { "RenderPipeline" = "LightweightPipeline" }
Tags { "RenderPipeline" = "UniversalPipeline" }
LOD 100
ZTest Always ZWrite Off Cull Off

Expand Down