diff --git a/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl b/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl
index 352feb10230..22b53658496 100644
--- a/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl
+++ b/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl
@@ -1189,7 +1189,7 @@ void ApplyDepthOffsetPositionInput(float3 V, float depthOffsetVS, float3 viewFor
 // ----------------------------------------------------------------------------
 // Terrain/Brush heightmap encoding/decoding
 // ----------------------------------------------------------------------------
-
+#ifndef UNITY_CG_INCLUDED
 #if defined(SHADER_API_VULKAN) || defined(SHADER_API_GLES) || defined(SHADER_API_GLES3)
 
 real4 PackHeightmap(real height)
@@ -1215,6 +1215,7 @@ real UnpackHeightmap(real4 height)
     return height.r;
 }
 
+#endif
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/com.unity.visualeffectgraph/CHANGELOG.md b/com.unity.visualeffectgraph/CHANGELOG.md
index 93c27e15c26..416c9e364f1 100644
--- a/com.unity.visualeffectgraph/CHANGELOG.md
+++ b/com.unity.visualeffectgraph/CHANGELOG.md
@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Tidy up of platform abstraction code for random number generation, requires a dependency on com.unity.render-pipelines.core for those abstractions.
 - Fixed shader compilation errors with textures in shader graph [Case 1309219](https://issuetracker.unity3d.com/product/unity/issues/guid/1309219/)
 - Fixed issue with VFX using incorrect buffer type for strip data
+- Compilation issue with builtin renderpipeline : redefinition of 'PackHeightmap'
 
 ## [11.0.0] - 2020-10-21
 ### Added