diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAsset.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAsset.asset index aaadf94732b..b7e92f84150 100644 --- a/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAsset.asset +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/CommonAssets/UniversalRPAsset.asset @@ -30,12 +30,12 @@ MonoBehaviour: - {fileID: 11400000, guid: 01247c41aba2d4bc0ad94a11af8bdb11, type: 2} - {fileID: 11400000, guid: 04618ff2d33c0432a81d00fdee3fae55, type: 2} - {fileID: 11400000, guid: eae387d1d2a20a946ae2441e0319f1a0, type: 2} + - {fileID: 11400000, guid: ab4527fe9ad5ef949bffe9447fabcfa2, type: 2} m_DefaultRendererIndex: 3 m_RequireDepthTexture: 1 m_RequireOpaqueTexture: 1 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 - m_StoreActionsOptimization: 0 m_SupportsHDR: 1 m_MSAA: 4 m_RenderScale: 1 @@ -60,6 +60,8 @@ MonoBehaviour: m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 m_SoftShadowsSupported: 1 + m_ConservativeEnclosingSphere: 0 + m_NumIterationsEnclosingSphere: 64 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 @@ -67,6 +69,7 @@ MonoBehaviour: m_MixedLightingSupported: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..b8e5d980ad5 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 98ba70fc60812574b938765de4bc7635 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..9fa9fb06dd4 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/Android/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: daeb2231ad8061143bbd17d2623f2e5c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..bb8c90c90f6 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 84d0b6382018135459f672aad52de4e8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..57ac6f19fd8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: ed9d296ed75c7214ea6419639176a962 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..52e4ed22274 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 6eb18cf58a8d34744b6a7f63f02c9461 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..851118d3c05 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: cf3fbd5f79ec6f24c91910cdb37141f4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..4ce8ef4ef12 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: aef25d142871f8d48ad891b803e05b1b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..fcf4af6fce2 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 2c86bc5678f7b4b45bc7944a0ff12b37 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..e59c16fc3ab --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 6e092d1d244070245a3c4b47cdea77cc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..48805796e54 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 5eac9d8273ed3dd478afc7c35d8e301e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..11a52574cab --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 60642d10b0704c94e8d983c374be7a3b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 1 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..a67e82f3f4b --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: f422beaa43ed3bf449efe74e80394895 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..346d8162eb3 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: f3226441198d81e4d8c434ff95e55a11 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..844c7cc7cc8 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 0270de7da6e4b0a45b5e390437a129de +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..80250119c38 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 2f09e9dc5b26440418403758c844a8e7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png new file mode 100644 index 00000000000..afb7ee9f480 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b9509adb0a6158109f3ee610cc0a7f4fd8efe3a57fe1cd79dbc57e5d97174b5 +size 23054 diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta new file mode 100644 index 00000000000..8b77ebb2dad --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/014_Layer_Batching_GlobalLightWithShadows.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 34575665745211f458121d068b5609cc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching/Layer Batching Renderer Data.asset b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching/Layer Batching Renderer Data.asset new file mode 100644 index 00000000000..605e417ba9d --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching/Layer Batching Renderer Data.asset @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 11145981673336645838492a2d98e247, type: 3} + m_Name: Layer Batching Renderer Data + m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, + type: 3} + m_RendererFeatures: [] + m_RendererFeatureMap: + m_UseNativeRenderPass: 0 + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 1, z: 0} + m_HDREmulationScale: 1 + m_LightRenderTextureScale: 0.5 + m_LightBlendStyles: + - name: Multiply + maskTextureChannel: 0 + blendMode: 1 + - name: Additive + maskTextureChannel: 0 + blendMode: 0 + - name: Multiply with Mask + maskTextureChannel: 1 + blendMode: 1 + - name: Additive with Mask + maskTextureChannel: 1 + blendMode: 0 + m_UseDepthStencilBuffer: 1 + m_UseCameraSortingLayersTexture: 0 + m_CameraSortingLayersTextureBound: -1 + m_CameraSortingLayerDownsamplingMethod: 0 + m_MaxLightRenderTextureCount: 16 + m_MaxShadowRenderTextureCount: 1 + m_ShapeLightShader: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3} + m_ShapeLightVolumeShader: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, + type: 3} + m_PointLightShader: {fileID: 4800000, guid: e35a31e1679aeff489e202f5cc4853d5, type: 3} + m_PointLightVolumeShader: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, + type: 3} + m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + m_SamplingShader: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, + type: 3} + m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, + type: 3} + m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, + type: 3} + m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, + type: 3} + m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, + type: 3} + m_PostProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} + m_DefaultMaterialType: 0 + m_DefaultCustomMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, + type: 2} + m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, + type: 2} + m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, + type: 2} + m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, + type: 2} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching/Layer Batching Renderer Data.asset.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching/Layer Batching Renderer Data.asset.meta new file mode 100644 index 00000000000..a5c79725ef0 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching/Layer Batching Renderer Data.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab4527fe9ad5ef949bffe9447fabcfa2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching_GlobalLightWithShadows.unity b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching_GlobalLightWithShadows.unity new file mode 100644 index 00000000000..0093b371cb3 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching_GlobalLightWithShadows.unity @@ -0,0 +1,989 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &499197015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 499197017} + - component: {fileID: 499197016} + m_Layer: 0 + m_Name: Point Light (Red) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &499197016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499197015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ComponentVersion: 1 + m_LightType: 3 + m_BlendStyleIndex: 0 + m_FalloffIntensity: 0.5 + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Intensity: 1 + m_LightVolumeIntensity: 1 + m_LightVolumeIntensityEnabled: 0 + m_ApplyToSortingLayers: eb0feddf00000000e980ef06 + m_LightCookieSprite: {fileID: 0} + m_DeprecatedPointLightCookieSprite: {fileID: 0} + m_LightOrder: 0 + m_OverlapOperation: 0 + m_NormalMapDistance: 3 + m_NormalMapQuality: 2 + m_UseNormalMap: 0 + m_ShadowIntensityEnabled: 0 + m_ShadowIntensity: 0.75 + m_ShadowVolumeIntensityEnabled: 0 + m_ShadowVolumeIntensity: 0.75 + m_Vertices: + - position: {x: 0.9985302, y: 0.9985302, z: 0} + color: {r: 0.70710677, g: 0.70710677, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: 0.9985302, y: 0.9985302, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: -0.9985302, y: 0.9985302, z: 0} + color: {r: -0.70710677, g: 0.70710677, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: -0.9985302, y: 0.9985302, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: -0.99853003, y: -0.9985304, z: 0} + color: {r: -0.70710665, g: -0.7071069, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: -0.99853003, y: -0.9985304, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: 0.99853003, y: -0.9985304, z: 0} + color: {r: 0.70710665, g: -0.7071069, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: 0.99853003, y: -0.9985304, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: 0, y: 0, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + m_Triangles: 030001000800020000000100030002000100050003000800040002000300050004000300070005000800060004000500070006000500010007000800000006000700010000000700 + m_LocalBounds: + m_Center: {x: 0, y: -0.00000011920929, z: 0} + m_Extent: {x: 0.9985302, y: 0.99853027, z: 0} + m_PointLightInnerAngle: 360 + m_PointLightOuterAngle: 360 + m_PointLightInnerRadius: 0 + m_PointLightOuterRadius: 9.070086 + m_ShapeLightParametricSides: 5 + m_ShapeLightParametricAngleOffset: 0 + m_ShapeLightParametricRadius: 1 + m_ShapeLightFalloffSize: 0.5 + m_ShapeLightFalloffOffset: {x: 0, y: 0} + m_ShapePath: + - {x: -0.5, y: -0.5, z: 0} + - {x: 0.5, y: -0.5, z: 0} + - {x: 0.5, y: 0.5, z: 0} + - {x: -0.5, y: 0.5, z: 0} +--- !u!4 &499197017 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 499197015} + m_LocalRotation: {x: 0, y: 0, z: 0.78703064, w: 0.6169139} + m_LocalPosition: {x: 3, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &664962768 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 664962770} + - component: {fileID: 664962769} + m_Layer: 0 + m_Name: Test + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &664962769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664962768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4221d6ddb809cfb488fde83fb0cd9e5d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Renderer2DData: {fileID: 11400000, guid: ab4527fe9ad5ef949bffe9447fabcfa2, type: 2} + m_ExpectedBatchCount: 1 + m_ObjectToToggle: {fileID: 1232935053} +--- !u!4 &664962770 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 664962768} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 7.2568426, y: -1.9692217, z: -0.079838954} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1011365374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1011365376} + - component: {fileID: 1011365375} + m_Layer: 0 + m_Name: Global Light (Green) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1011365375 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1011365374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ComponentVersion: 1 + m_LightType: 4 + m_BlendStyleIndex: 0 + m_FalloffIntensity: 0.5 + m_Color: {r: 0, g: 1, b: 0, a: 1} + m_Intensity: 0.08 + m_LightVolumeIntensity: 1 + m_LightVolumeIntensityEnabled: 0 + m_ApplyToSortingLayers: eb0feddf00000000e980ef06 + m_LightCookieSprite: {fileID: 0} + m_DeprecatedPointLightCookieSprite: {fileID: 0} + m_LightOrder: 0 + m_OverlapOperation: 0 + m_NormalMapDistance: 3 + m_NormalMapQuality: 2 + m_UseNormalMap: 0 + m_ShadowIntensityEnabled: 1 + m_ShadowIntensity: 0.75 + m_ShadowVolumeIntensityEnabled: 1 + m_ShadowVolumeIntensity: 0.75 + m_Vertices: + - position: {x: 0.9985302, y: 0.9985302, z: 0} + color: {r: 0.70710677, g: 0.70710677, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: 0.9985302, y: 0.9985302, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: -0.9985302, y: 0.9985302, z: 0} + color: {r: -0.70710677, g: 0.70710677, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: -0.9985302, y: 0.9985302, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: -0.99853003, y: -0.9985304, z: 0} + color: {r: -0.70710665, g: -0.7071069, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: -0.99853003, y: -0.9985304, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: 0.99853003, y: -0.9985304, z: 0} + color: {r: 0.70710665, g: -0.7071069, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: 0.99853003, y: -0.9985304, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: 0, y: 0, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + m_Triangles: 030001000800020000000100030002000100050003000800040002000300050004000300070005000800060004000500070006000500010007000800000006000700010000000700 + m_LocalBounds: + m_Center: {x: 0, y: -0.00000011920929, z: 0} + m_Extent: {x: 0.9985302, y: 0.99853027, z: 0} + m_PointLightInnerAngle: 360 + m_PointLightOuterAngle: 360 + m_PointLightInnerRadius: 0 + m_PointLightOuterRadius: 1 + m_ShapeLightParametricSides: 5 + m_ShapeLightParametricAngleOffset: 0 + m_ShapeLightParametricRadius: 1 + m_ShapeLightFalloffSize: 0.5 + m_ShapeLightFalloffOffset: {x: 0, y: 0} + m_ShapePath: + - {x: -0.5, y: -0.5, z: 0} + - {x: 0.5, y: -0.5, z: 0} + - {x: 0.5, y: 0.5, z: 0} + - {x: -0.5, y: 0.5, z: 0} +--- !u!4 &1011365376 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1011365374} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1187331456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1187331458} + - component: {fileID: 1187331457} + m_Layer: 0 + m_Name: Square (BG) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1187331457 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187331456} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -538112021 + m_SortingLayer: -1 + m_SortingOrder: -34 + m_Sprite: {fileID: 7482667652216324306, guid: d570fe925f48c8e43b263e261a29b3c7, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1187331458 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1187331456} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5, y: 2, z: 0} + m_LocalScale: {x: 4, y: 4, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1202039385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1202039387} + - component: {fileID: 1202039386} + m_Layer: 0 + m_Name: Square (Default) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1202039386 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1202039385} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -34 + m_Sprite: {fileID: 7482667652216324306, guid: d570fe925f48c8e43b263e261a29b3c7, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1202039387 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1202039385} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4, y: 4, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1232935053 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1232935055} + - component: {fileID: 1232935054} + m_Layer: 0 + m_Name: Test Result + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1232935054 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232935053} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, + type: 3} + m_Color: {r: 0, g: 1, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1232935055 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232935053} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.67, y: -3.82, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1627763796 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1627763800} + - component: {fileID: 1627763799} + - component: {fileID: 1627763798} + - component: {fileID: 1627763797} + - component: {fileID: 1627763801} + m_Layer: 0 + m_Name: Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1627763797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627763796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: 13 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 +--- !u!81 &1627763798 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627763796} + m_Enabled: 1 +--- !u!20 &1627763799 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627763796} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1627763800 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627763796} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1627763801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627763796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} + m_Name: + m_EditorClassIdentifier: + ImageComparisonSettings: + TargetWidth: 512 + TargetHeight: 256 + PerPixelCorrectnessThreshold: 0.001 + PerPixelGammaThreshold: 0.003921569 + PerPixelAlphaThreshold: 0.003921569 + AverageCorrectnessThreshold: 0.005 + IncorrectPixelsThreshold: 0.0000038146973 + UseHDR: 0 + UseBackBuffer: 0 + ImageResolution: 0 + ActiveImageTests: 1 + ActivePixelTests: 7 + WaitFrames: 15 + XRCompatible: 0 + CheckMemoryAllocation: 1 +--- !u!1 &1755969217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1755969219} + - component: {fileID: 1755969218} + m_Layer: 0 + m_Name: Square (FG) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1755969218 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755969217} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 116359401 + m_SortingLayer: 1 + m_SortingOrder: -34 + m_Sprite: {fileID: 7482667652216324306, guid: d570fe925f48c8e43b263e261a29b3c7, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1755969219 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755969217} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5, y: -2, z: 0} + m_LocalScale: {x: 4, y: 4, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1771418502 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1771418504} + - component: {fileID: 1771418503} + m_Layer: 0 + m_Name: Point Light (Blue) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1771418503 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771418502} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ComponentVersion: 1 + m_LightType: 3 + m_BlendStyleIndex: 0 + m_FalloffIntensity: 0.5 + m_Color: {r: 0, g: 0, b: 1, a: 1} + m_Intensity: 1 + m_LightVolumeIntensity: 1 + m_LightVolumeIntensityEnabled: 0 + m_ApplyToSortingLayers: eb0feddf00000000e980ef06 + m_LightCookieSprite: {fileID: 0} + m_DeprecatedPointLightCookieSprite: {fileID: 0} + m_LightOrder: 0 + m_OverlapOperation: 0 + m_NormalMapDistance: 3 + m_NormalMapQuality: 2 + m_UseNormalMap: 0 + m_ShadowIntensityEnabled: 0 + m_ShadowIntensity: 0.75 + m_ShadowVolumeIntensityEnabled: 0 + m_ShadowVolumeIntensity: 0.75 + m_Vertices: + - position: {x: 0.9985302, y: 0.9985302, z: 0} + color: {r: 0.70710677, g: 0.70710677, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: 0.9985302, y: 0.9985302, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: -0.9985302, y: 0.9985302, z: 0} + color: {r: -0.70710677, g: 0.70710677, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: -0.9985302, y: 0.9985302, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: -0.99853003, y: -0.9985304, z: 0} + color: {r: -0.70710665, g: -0.7071069, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: -0.99853003, y: -0.9985304, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: 0.99853003, y: -0.9985304, z: 0} + color: {r: 0.70710665, g: -0.7071069, b: 0, a: 0} + uv: {x: 0, y: 0} + - position: {x: 0.99853003, y: -0.9985304, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + - position: {x: 0, y: 0, z: 0} + color: {r: 0, g: 0, b: 0, a: 1} + uv: {x: 0, y: 0} + m_Triangles: 030001000800020000000100030002000100050003000800040002000300050004000300070005000800060004000500070006000500010007000800000006000700010000000700 + m_LocalBounds: + m_Center: {x: 0, y: -0.00000011920929, z: 0} + m_Extent: {x: 0.9985302, y: 0.99853027, z: 0} + m_PointLightInnerAngle: 360 + m_PointLightOuterAngle: 360 + m_PointLightInnerRadius: 0 + m_PointLightOuterRadius: 9.070086 + m_ShapeLightParametricSides: 5 + m_ShapeLightParametricAngleOffset: 0 + m_ShapeLightParametricRadius: 1 + m_ShapeLightFalloffSize: 0.5 + m_ShapeLightFalloffOffset: {x: 0, y: 0} + m_ShapePath: + - {x: -0.5, y: -0.5, z: 0} + - {x: 0.5, y: -0.5, z: 0} + - {x: 0.5, y: 0.5, z: 0} + - {x: -0.5, y: 0.5, z: 0} +--- !u!4 &1771418504 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1771418502} + m_LocalRotation: {x: 0, y: 0, z: 0.78703064, w: 0.6169139} + m_LocalPosition: {x: -3, y: -3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching_GlobalLightWithShadows.unity.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching_GlobalLightWithShadows.unity.meta new file mode 100644 index 00000000000..74323323934 --- /dev/null +++ b/TestProjects/UniversalGraphicsTest_2D/Assets/Scenes/014_Layer_Batching_GlobalLightWithShadows.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 428ccbee9b0fb7c4ca5f4dd5579b62d3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.2D.Runtime.asmdef b/TestProjects/UniversalGraphicsTest_2D/Assets/Unity.Testing.SRP.Universal.2D.Runtime.asmdef similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.2D.Runtime.asmdef rename to TestProjects/UniversalGraphicsTest_2D/Assets/Unity.Testing.SRP.Universal.2D.Runtime.asmdef diff --git a/TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.2D.Runtime.asmdef.meta b/TestProjects/UniversalGraphicsTest_2D/Assets/Unity.Testing.SRP.Universal.2D.Runtime.asmdef.meta similarity index 100% rename from TestProjects/UniversalGraphicsTest_2D/Assets/Test/Runtime/Unity.Testing.SRP.Universal.2D.Runtime.asmdef.meta rename to TestProjects/UniversalGraphicsTest_2D/Assets/Unity.Testing.SRP.Universal.2D.Runtime.asmdef.meta diff --git a/TestProjects/UniversalGraphicsTest_2D/ProjectSettings/EditorBuildSettings.asset b/TestProjects/UniversalGraphicsTest_2D/ProjectSettings/EditorBuildSettings.asset index 4546be31ee6..c25a79b725c 100644 --- a/TestProjects/UniversalGraphicsTest_2D/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/UniversalGraphicsTest_2D/ProjectSettings/EditorBuildSettings.asset @@ -191,6 +191,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/013_Shadergraph_AlphaBlend.unity guid: a845098be7b438b40a7f4dee1b6aa5aa + - enabled: 1 + path: Assets/Scenes/014_Layer_Batching_GlobalLightWithShadows.unity + guid: 428ccbee9b0fb7c4ca5f4dd5579b62d3 - enabled: 1 path: Assets/Scenes/072_Shadow_Prerendering.unity guid: 5c51bb3f8f127fd4cbfa0fbdb9221b0e diff --git a/TestProjects/UniversalGraphicsTest_2D/UserSettings/EditorUserSettings.asset b/TestProjects/UniversalGraphicsTest_2D/UserSettings/EditorUserSettings.asset index d71b3547a31..0dfc0cec6e0 100644 --- a/TestProjects/UniversalGraphicsTest_2D/UserSettings/EditorUserSettings.asset +++ b/TestProjects/UniversalGraphicsTest_2D/UserSettings/EditorUserSettings.asset @@ -5,6 +5,12 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: + RecentlyUsedSceneGuid-0: + value: 500100050301510f5a0d0a7b137b0d44174e497e297870687e7c4c6ab5b1636e + flags: 0 + RecentlyUsedSceneGuid-1: + value: 57030c0506570c5e540c5c2412745c4415164d2c782c2265787e4431b4b2306b + flags: 0 RecentlyUsedScenePath-0: value: 550901035c075f5f595b5c7749720d4412151d7f7f2c75347f7b4436e3b8636e flags: 0 @@ -43,6 +49,9 @@ EditorUserSettings: m_VCDebugCmd: 0 m_VCDebugOut: 0 m_SemanticMergeMode: 2 + m_DesiredImportWorkerCount: 4 + m_StandbyImportWorkerCount: 2 + m_IdleImportWorkerShutdownDelay: 60000 m_VCShowFailedCheckout: 1 m_VCOverwriteFailedCheckoutAssets: 1 m_VCProjectOverlayIcons: 1 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/230_Decal.png index 53e2819eafd..d3fa7fad75c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ff4f95b5eb7b67ad26973601c0ec1bfc62367bd373a7befd074307a031fc1ec9 -size 836198 +oid sha256:e8a0631947bb36f7cfcbbd1004ae00ab3ce4fc11e38280f7c194cf0400858dd5 +size 1296480 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders.png index 9348d6d0b24..08a1cca831c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f81757698a337a2c029cf3089f6b558636616efeab5ca34ead791805595e07a0 -size 360396 +oid sha256:9802df5692dbc7175932331bc91e4bac07bc2ded0ed21ac28cbb87bd3ad04b0d +size 355375 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_RT.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_RT.png index affd7b149fa..b803a95b60e 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_RT.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/035_Shader_TerrainShaders_RT.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:377c28a6bf5eaa969933c200c64adc698ed6669c246e862cbb9472225ee94960 -size 293038 +oid sha256:64c51853fc219a481fe1789b4439822e75d498ef0eeccb8c1273cf8b8c15bda4 +size 289706 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/230_Decal.png index 7bcb989c0de..d3fa7fad75c 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/Android/Vulkan/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2f983c91242adbba6f7f022b912942b7aa41405118befb3f44828337fb662df -size 1240812 +oid sha256:e8a0631947bb36f7cfcbbd1004ae00ab3ce4fc11e38280f7c194cf0400858dd5 +size 1296480 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/230_Decal.png index 854e12bd338..e37afe410d6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/IPhonePlayer/Metal/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e7bfe140258aa69da62b6213fe589e649bc1e877b3740877681c3b3631d4589 -size 1234723 +oid sha256:a017596e8a6f37f8fc0b6f1013859e1fb2e60412961351af6252cdd52be9c7ea +size 1332557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/230_Decal.png index 6f61c3800a1..e37afe410d6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:a017596e8a6f37f8fc0b6f1013859e1fb2e60412961351af6252cdd52be9c7ea +size 1332557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/230_Decal.png index 9b8c73f1a5d..e37afe410d6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b486a92a5aaf0c0c36eeaf664db706c25074e270504f92d20a6aee1574fecc07 -size 1286588 +oid sha256:a017596e8a6f37f8fc0b6f1013859e1fb2e60412961351af6252cdd52be9c7ea +size 1332557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/230_Decal.png index b673d9f00df..e37afe410d6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bb04b9a74e89246e7cf7771d3e9e66b6175aba4747dfc65eca1c00f34521dc3 -size 1290151 +oid sha256:a017596e8a6f37f8fc0b6f1013859e1fb2e60412961351af6252cdd52be9c7ea +size 1332557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png index 6f61c3800a1..e37afe410d6 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:a017596e8a6f37f8fc0b6f1013859e1fb2e60412961351af6252cdd52be9c7ea +size 1332557 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/230_Decal.png index 6f61c3800a1..ebf58c8be89 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXEditor/OpenGLCore/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:22b7531f4062283541491447023dfcbe8b70f0b949854b15080fa020cafb0d6a +size 1327956 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/230_Decal.png index 6f61c3800a1..ebf58c8be89 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:22b7531f4062283541491447023dfcbe8b70f0b949854b15080fa020cafb0d6a +size 1327956 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/230_Decal.png index 6f61c3800a1..ebf58c8be89 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/OSXPlayer/OpenGLCore/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:22b7531f4062283541491447023dfcbe8b70f0b949854b15080fa020cafb0d6a +size 1327956 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/230_Decal.png index 6f61c3800a1..ebf58c8be89 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:22b7531f4062283541491447023dfcbe8b70f0b949854b15080fa020cafb0d6a +size 1327956 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/230_Decal.png index 6f61c3800a1..6d5152446bf 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:7c31f0f4f455c9b1c72a31ad8843c67ac2c5811afddf502add3f8ed3e371bce4 +size 1327966 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png index 7b061c2ae45..80f0975494a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:906691a7a80465740d21fb3c261b03fa80b83ac509c759dabf8b6f3bbc3cd21b -size 1285987 +oid sha256:d96c224737ac305b73dc67b234be3554026276c1ff1f7cf354c10850c012e3d0 +size 1504847 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png.meta index 566cfaadeb1..f2d7831b1d0 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png.meta +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/230_Decal.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 6c328d0e2b56e5c448acb1b11e2d288a +guid: e586516144439174596721855c6a1a7b TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - isReadable: 0 + flipGreenChannel: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -38,7 +40,7 @@ TextureImporter: wrapU: 0 wrapV: 0 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -62,13 +64,14 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -91,7 +94,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/230_Decal.png index 6f61c3800a1..c06fe1c583a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:febf291dc3116fd42e777743148d2c67a604bec8d6a2d95237243a945a4fcf4c +size 1329902 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/230_Decal.png index 6f61c3800a1..06a39aa5f07 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:417497583c1891d0516b25ebdba8b62c26cb46f86549a26555b80304885f5526 -size 1467401 +oid sha256:5e002d53916c231a05d24744abbfd8868e3415af122c96dc48de71fe527c2757 +size 1329918 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png index f4d0474e594..80f0975494a 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a21458a3772a04f90e90524bf43b040daaeff82f6786b785ffc823e6c8f9d1c4 -size 1288916 +oid sha256:d96c224737ac305b73dc67b234be3554026276c1ff1f7cf354c10850c012e3d0 +size 1504847 diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png.meta index e96ec93bad3..1554c08df46 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png.meta +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/230_Decal.png.meta @@ -20,10 +20,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +64,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + swizzle: 50462976 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -91,7 +94,6 @@ TextureImporter: nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/CircleNormal.jpg.meta b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/CircleNormal.jpg.meta index b63a3a2e7e4..01ebaff7766 100644 --- a/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/CircleNormal.jpg.meta +++ b/TestProjects/UniversalGraphicsTest_Terrain/Assets/Scenes/230_Decal/CircleNormal.jpg.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -52,7 +53,7 @@ TextureImporter: alphaUsage: 1 alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -75,6 +76,30 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index d988de57180..21b132c9b91 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -30,10 +30,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed a regression where ShaderGraph screen position was not correct in game view and when using XR [1369450] - Fixed overwriting of preview camera background color. [case 1357004](https://issuetracker.unity3d.com/product/unity/issues/guid/1361557/) - Fixed ShadowCaster now requires varying normalWS to include changed normals from vertex shader in shader graph. +- Fixed an issue where 2D global lights with shadows enabled could break light layer batching [case 1376487](https://issuetracker.unity3d.com/issues/2d-urp-upgrading-global-light-sets-shadow-settings-to-enabled) - Fixed typo in numIterationsEnclosingSphere api name - Fix for rendering thumbnails. [case 1348209](https://issuetracker.unity3d.com/issues/preview-of-assets-do-not-show-in-the-project-window) - Fixed a regression bug where XR camera postion can not be modified in beginCameraRendering [case 1365000] - Fixed an issue in where installing the Adaptive Performance package caused errors to the inspector UI [1368161](https://issuetracker.unity3d.com/issues/urp-package-throws-compilation-error-cs1525-when-imported-together-with-adaptive-performance-package) +- Fixed broken soft shadow filtering. [case 1374960](https://issuetracker.unity3d.com/product/unity/issues/guid/1374960/) +- Fixed Lens Flare not accounting Render Scale setting. [case 1376820](https://issuetracker.unity3d.com/issues/urp-lens-flare-do-not-account-for-render-scale-setting) +- Fixed an issue where SSAO would throw a "RenderingCommandBuffer: invalid pass index" errors. [case 1374215](https://issuetracker.unity3d.com/issues/urp-renderingcommandbuffer-invalid-pass-index-errors-when-opening-urp-sample-scenes) +- Fixed performance regression for 2D shaders where alpha discard was disabled. [case 1335648] +- Fixed an issue with MSAA falling back to the incorrect value when sample count 2 is not supported on some Android GPUs +- Fixed decals to work with native render pass [case 1353141](https://issuetracker.unity3d.com/issues/urp-decals-are-not-visible-in-game-view-after-modifying-urp-asset-properties) +- Fixed decals to work with render scale [1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings) - Fixed a regression where filtering the scene view yielded incorrect visual results [1360233](https://issuetracker.unity3d.com/product/unity/issues/guid/1360233) - Fixed disabled debug lighting modes on Vulkan and OpenGL following a shader compiler fix. [case 1334240] - Fixed an issue in where the Convert Renderering Settings would cause a freeze. [case 1353885](https://issuetracker.unity3d.com/issues/urp-builtin-to-urp-render-pipeline-converter-freezes-the-editor-when-converting-rendering-settings) diff --git a/com.unity.render-pipelines.universal/Editor/Decal/DecalPass.template b/com.unity.render-pipelines.universal/Editor/Decal/DecalPass.template index aa35678860b..1a019c30d84 100644 --- a/com.unity.render-pipelines.universal/Editor/Decal/DecalPass.template +++ b/com.unity.render-pipelines.universal/Editor/Decal/DecalPass.template @@ -81,6 +81,9 @@ Pass // Graph Properties $splice(GraphProperties) + // Graph Includes + $splice(GraphIncludes) + // Graph Functions $splice(GraphFunctions) diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGUI/ShadingModels/LitGUI.cs b/com.unity.render-pipelines.universal/Editor/ShaderGUI/ShadingModels/LitGUI.cs index 60a2f3b861d..f94d75241de 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGUI/ShadingModels/LitGUI.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderGUI/ShadingModels/LitGUI.cs @@ -173,9 +173,8 @@ public static void DoClearCoat(LitProperties properties, MaterialEditor material EditorGUI.BeginDisabledGroup(!coatEnabled); { - materialEditor.TexturePropertySingleLine(Styles.clearCoatMaskText, properties.clearCoatMap, properties.clearCoatMask); - EditorGUI.indentLevel += 2; + materialEditor.TexturePropertySingleLine(Styles.clearCoatMaskText, properties.clearCoatMap, properties.clearCoatMask); // Texture and HDR color controls materialEditor.ShaderProperty(properties.clearCoatSmoothness, Styles.clearCoatSmoothnessText); diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl index ef7614dd968..c64f08bc7cd 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRForwardPass.hlsl @@ -22,7 +22,7 @@ void InitializeInputData(Varyings input, SurfaceDescription surfaceDescription, inputData.normalWS = input.normalWS; #endif inputData.normalWS = NormalizeNormalPerPixel(inputData.normalWS); - inputData.viewDirectionWS = SafeNormalize(input.viewDirectionWS); + inputData.viewDirectionWS = SafeNormalize(GetWorldSpaceViewDir(input.positionWS)); #if defined(REQUIRES_VERTEX_SHADOW_COORD_INTERPOLATOR) inputData.shadowCoord = input.shadowCoord; diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl index 9e061d5a729..ec1fc90c268 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/PBRGBufferPass.hlsl @@ -23,7 +23,7 @@ void InitializeInputData(Varyings input, SurfaceDescription surfaceDescription, inputData.normalWS = input.normalWS; #endif inputData.normalWS = NormalizeNormalPerPixel(inputData.normalWS); - inputData.viewDirectionWS = SafeNormalize(input.viewDirectionWS); + inputData.viewDirectionWS = SafeNormalize(GetWorldSpaceViewDir(input.positionWS)); #if defined(MAIN_LIGHT_CALCULATE_SHADOWS) inputData.shadowCoord = TransformWorldToShadowCoord(inputData.positionWS); diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UnlitPass.hlsl b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UnlitPass.hlsl index 8cb99644d7a..ed9a84bb0b4 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UnlitPass.hlsl +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/UnlitPass.hlsl @@ -9,7 +9,6 @@ void InitializeInputData(Varyings input, out InputData inputData) #if defined(DEBUG_DISPLAY) inputData.positionWS = input.positionWS; inputData.normalWS = input.normalWS; - inputData.viewDirectionWS = input.viewDirectionWS; #else inputData.positionWS = half3(0, 0, 0); inputData.normalWS = half3(0, 0, 1); diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/Varyings.hlsl b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/Varyings.hlsl index 5267bae47f4..ee1e41b2972 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/Varyings.hlsl +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/Varyings.hlsl @@ -162,12 +162,6 @@ Varyings BuildVaryings(Attributes input) output.color = input.color; #endif -#ifdef VARYINGS_NEED_VIEWDIRECTION_WS - // Need the unnormalized direction here as otherwise interpolation is incorrect. - // It is normalized after interpolation in the fragment shader. - output.viewDirectionWS = GetWorldSpaceViewDir(positionWS); -#endif - #ifdef VARYINGS_NEED_SCREENPOSITION output.screenPosition = vertexInput.positionNDC; #endif diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalDecalSubTarget.cs b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalDecalSubTarget.cs index d0ab95a61c1..734fa568b39 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalDecalSubTarget.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalDecalSubTarget.cs @@ -627,7 +627,6 @@ static class DecalRequiredFields public static FieldCollection ScreenSpaceProjector = new FieldCollection() { StructFields.Varyings.normalWS, - StructFields.Varyings.viewDirectionWS, UniversalStructFields.Varyings.staticLightmapUV, UniversalStructFields.Varyings.dynamicLightmapUV, UniversalStructFields.Varyings.sh, @@ -639,7 +638,6 @@ static class DecalRequiredFields public static FieldCollection GBufferProjector = new FieldCollection() { StructFields.Varyings.normalWS, - StructFields.Varyings.viewDirectionWS, UniversalStructFields.Varyings.staticLightmapUV, UniversalStructFields.Varyings.dynamicLightmapUV, UniversalStructFields.Varyings.sh, @@ -657,7 +655,6 @@ static class DecalRequiredFields StructFields.Varyings.tangentWS, StructFields.Varyings.positionWS, StructFields.Varyings.texCoord0, - StructFields.Varyings.viewDirectionWS, UniversalStructFields.Varyings.staticLightmapUV, UniversalStructFields.Varyings.dynamicLightmapUV, UniversalStructFields.Varyings.sh, diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalLitSubTarget.cs b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalLitSubTarget.cs index 95d3272a1ee..ce9837fac2c 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalLitSubTarget.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalLitSubTarget.cs @@ -774,7 +774,6 @@ static class LitRequiredFields StructFields.Varyings.positionWS, StructFields.Varyings.normalWS, StructFields.Varyings.tangentWS, // needed for vertex lighting - StructFields.Varyings.viewDirectionWS, UniversalStructFields.Varyings.staticLightmapUV, UniversalStructFields.Varyings.dynamicLightmapUV, UniversalStructFields.Varyings.sh, @@ -789,7 +788,6 @@ static class LitRequiredFields StructFields.Varyings.positionWS, StructFields.Varyings.normalWS, StructFields.Varyings.tangentWS, // needed for vertex lighting - StructFields.Varyings.viewDirectionWS, UniversalStructFields.Varyings.staticLightmapUV, UniversalStructFields.Varyings.dynamicLightmapUV, UniversalStructFields.Varyings.sh, diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalUnlitSubTarget.cs b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalUnlitSubTarget.cs index a7933b9d2ff..1f545756fc2 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalUnlitSubTarget.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Targets/UniversalUnlitSubTarget.cs @@ -319,8 +319,7 @@ static class UnlitRequiredFields public static readonly FieldCollection Unlit = new FieldCollection() { StructFields.Varyings.positionWS, - StructFields.Varyings.normalWS, - StructFields.Varyings.viewDirectionWS, + StructFields.Varyings.normalWS }; public static readonly FieldCollection DepthNormalsOnly = new FieldCollection() diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Templates/ShaderPass.template b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Templates/ShaderPass.template index b1fecb7d2b0..015400c092b 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Templates/ShaderPass.template +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Templates/ShaderPass.template @@ -49,7 +49,6 @@ $Varyings.texCoord3: #define VARYINGS_NEED_TEXCOORD3 $Varyings.color: #define VARYINGS_NEED_COLOR $Varyings.elementToWorld0: #define VARYINGS_NEED_ELEMENT_TO_WORLD $Varyings.worldToElement0: #define VARYINGS_NEED_WORLD_TO_ELEMENT -$Varyings.viewDirectionWS: #define VARYINGS_NEED_VIEWDIRECTION_WS $Varyings.bitangentWS: #define VARYINGS_NEED_BITANGENT_WS $Varyings.screenPosition: #define VARYINGS_NEED_SCREENPOSITION $Varyings.fogFactorAndVertexLight: #define VARYINGS_NEED_FOG_AND_VERTEX_LIGHT diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Templates/SharedCode.template.hlsl b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Templates/SharedCode.template.hlsl index 46cfe4a99a3..b2721a2364f 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/Templates/SharedCode.template.hlsl +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/Templates/SharedCode.template.hlsl @@ -38,7 +38,7 @@ SurfaceDescriptionInputs BuildSurfaceDescriptionInputs(Varyings input) $SurfaceDescriptionInputs.ObjectSpaceBiTangent: output.ObjectSpaceBiTangent = TransformWorldToObjectDir(output.WorldSpaceBiTangent); $SurfaceDescriptionInputs.ViewSpaceBiTangent: output.ViewSpaceBiTangent = TransformWorldToViewDir(output.WorldSpaceBiTangent); $SurfaceDescriptionInputs.TangentSpaceBiTangent: output.TangentSpaceBiTangent = float3(0.0f, 1.0f, 0.0f); - $SurfaceDescriptionInputs.WorldSpaceViewDirection: output.WorldSpaceViewDirection = normalize(input.viewDirectionWS); + $SurfaceDescriptionInputs.WorldSpaceViewDirection: output.WorldSpaceViewDirection = normalize(GetWorldSpaceViewDir(input.positionWS)); $SurfaceDescriptionInputs.ObjectSpaceViewDirection: output.ObjectSpaceViewDirection = TransformWorldToObjectDir(output.WorldSpaceViewDirection); $SurfaceDescriptionInputs.ViewSpaceViewDirection: output.ViewSpaceViewDirection = TransformWorldToViewDir(output.WorldSpaceViewDirection); $SurfaceDescriptionInputs.TangentSpaceViewDirection: float3x3 tangentSpaceTransform = float3x3(output.WorldSpaceTangent, output.WorldSpaceBiTangent, output.WorldSpaceNormal); diff --git a/com.unity.render-pipelines.universal/Editor/ShaderGraph/UniversalStructs.cs b/com.unity.render-pipelines.universal/Editor/ShaderGraph/UniversalStructs.cs index a5c0af08f67..154039cd6b1 100644 --- a/com.unity.render-pipelines.universal/Editor/ShaderGraph/UniversalStructs.cs +++ b/com.unity.render-pipelines.universal/Editor/ShaderGraph/UniversalStructs.cs @@ -20,7 +20,6 @@ static class UniversalStructs StructFields.Varyings.texCoord2, StructFields.Varyings.texCoord3, StructFields.Varyings.color, - StructFields.Varyings.viewDirectionWS, StructFields.Varyings.screenPosition, UniversalStructFields.Varyings.staticLightmapUV, UniversalStructFields.Varyings.dynamicLightmapUV, diff --git a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs index 04cb9e74224..a9280ee9df6 100644 --- a/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs +++ b/com.unity.render-pipelines.universal/Runtime/2D/Passes/Utility/LayerUtility.cs @@ -69,7 +69,8 @@ private static bool CanBatchLightsInLayer(int layerIndex1, int layerIndex2, Sort foreach (var light in lightCullResult.visibleLights) { // If the lit layers are different, or if they are lit but this is a shadow casting light then don't batch. - if ((light.IsLitLayer(layerId1) != light.IsLitLayer(layerId2)) || (light.IsLitLayer(layerId1) && light.shadowsEnabled)) + bool lightCastsShadows = (light.lightType != Light2D.LightType.Global && light.shadowsEnabled); + if ((light.IsLitLayer(layerId1) != light.IsLitLayer(layerId2)) || (light.IsLitLayer(layerId1) && lightCastsShadows)) return false; } return true; diff --git a/com.unity.render-pipelines.universal/Runtime/Decal/DBuffer/DBufferRenderPass.cs b/com.unity.render-pipelines.universal/Runtime/Decal/DBuffer/DBufferRenderPass.cs index 1f7e3d0e02f..cbb86b1a5be 100644 --- a/com.unity.render-pipelines.universal/Runtime/Decal/DBuffer/DBufferRenderPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Decal/DBuffer/DBufferRenderPass.cs @@ -24,12 +24,17 @@ internal class DBufferRenderPass : ScriptableRenderPass private int m_DBufferCount; private ProfilingSampler m_ProfilingSampler; + private RenderTargetHandle m_DBufferDepth; + private RenderTargetHandle m_CameraDepthTexture; + private RenderTargetHandle m_CameraDepthAttachment; + internal DeferredLights deferredLights { get; set; } private bool isDeferred => deferredLights != null; internal RenderTargetIdentifier[] dBufferColorIndentifiers { get; private set; } - internal RenderTargetIdentifier dBufferDepthIndentifier { get; private set; } - internal RenderTargetIdentifier cameraDepthTextureIndentifier { get; private set; } - internal RenderTargetIdentifier cameraDepthAttachmentIndentifier { get; private set; } + + internal RenderTargetHandle dBufferDepth => m_DBufferDepth; + internal RenderTargetHandle cameraDepthTexture => m_CameraDepthTexture; + internal RenderTargetHandle cameraDepthAttachment => m_CameraDepthAttachment; public DBufferRenderPass(Material dBufferClear, DBufferSettings settings, DecalDrawDBufferSystem drawSystem) { @@ -51,9 +56,9 @@ public DBufferRenderPass(Material dBufferClear, DBufferSettings settings, DecalD dBufferColorIndentifiers[dbufferIndex] = new RenderTargetIdentifier(s_DBufferNames[dbufferIndex]); m_DBufferCount = dBufferCount; - dBufferDepthIndentifier = new RenderTargetIdentifier(s_DBufferDepthName); - cameraDepthTextureIndentifier = new RenderTargetIdentifier("_CameraDepthTexture"); - cameraDepthAttachmentIndentifier = new RenderTargetIdentifier("_CameraDepthAttachment"); + m_DBufferDepth.Init(s_DBufferDepthName); + m_CameraDepthTexture.Init("_CameraDepthTexture"); + m_CameraDepthAttachment.Init("_CameraDepthAttachment"); } public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderingData) @@ -97,12 +102,12 @@ public override void OnCameraSetup(CommandBuffer cmd, ref RenderingData renderin depthDesc.depthStencilFormat = renderingData.cameraData.cameraTargetDescriptor.depthStencilFormat; depthDesc.msaaSamples = 1; - cmd.GetTemporaryRT(Shader.PropertyToID(s_DBufferDepthName), depthDesc); - depthIdentifier = dBufferDepthIndentifier; + cmd.GetTemporaryRT(m_DBufferDepth.id, depthDesc); + depthIdentifier = m_DBufferDepth.Identifier(); } else { - depthIdentifier = deferredLights.DepthAttachmentIdentifier; + depthIdentifier = m_CameraDepthAttachment.Identifier(); } ConfigureTarget(dBufferColorIndentifiers, depthIdentifier); @@ -184,7 +189,7 @@ public override void OnCameraCleanup(CommandBuffer cmd) } if (!isDeferred) - cmd.ReleaseTemporaryRT(Shader.PropertyToID(s_DBufferDepthName)); + cmd.ReleaseTemporaryRT(m_DBufferDepth.id); } } } diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/AdditionalLightsShadowCasterPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/AdditionalLightsShadowCasterPass.cs index c7050766841..ae83372bcfe 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/AdditionalLightsShadowCasterPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/AdditionalLightsShadowCasterPass.cs @@ -84,7 +84,6 @@ public ShadowResolutionRequest(int _visibleLightIndex, int _perLightShadowSliceI bool m_CreateEmptyShadowmap; - bool m_SupportsBoxFilterForShadows; ProfilingSampler m_ProfilingSetupSampler = new ProfilingSampler("Setup Additional Shadows"); int MAX_PUNCTUAL_LIGHT_SHADOW_SLICES_IN_UBO // keep in sync with MAX_PUNCTUAL_LIGHT_SHADOW_SLICES_IN_UBO in Shadows.hlsl @@ -118,7 +117,6 @@ public AdditionalLightsShadowCasterPass(RenderPassEvent evt) m_AdditionalShadowParams_SSBO = Shader.PropertyToID("_AdditionalShadowParams_SSBO"); m_UseStructuredBuffer = RenderingUtils.useStructuredBuffer; - m_SupportsBoxFilterForShadows = Application.isMobilePlatform || SystemInfo.graphicsDeviceType == GraphicsDeviceType.Switch; // Preallocated a fixed size. CommandBuffer.SetGlobal* does allow this data to grow. int maxVisibleAdditionalLights = UniversalRenderPipeline.maxVisibleAdditionalLights; @@ -977,17 +975,14 @@ void SetupAdditionalLightsShadowReceiverConstants(CommandBuffer cmd, ref ShadowD if (softShadows) { - if (m_SupportsBoxFilterForShadows) - { - cmd.SetGlobalVector(AdditionalShadowsConstantBuffer._AdditionalShadowOffset0, + cmd.SetGlobalVector(AdditionalShadowsConstantBuffer._AdditionalShadowOffset0, new Vector4(-invHalfShadowAtlasWidth, -invHalfShadowAtlasHeight, 0.0f, 0.0f)); - cmd.SetGlobalVector(AdditionalShadowsConstantBuffer._AdditionalShadowOffset1, + cmd.SetGlobalVector(AdditionalShadowsConstantBuffer._AdditionalShadowOffset1, new Vector4(invHalfShadowAtlasWidth, -invHalfShadowAtlasHeight, 0.0f, 0.0f)); - cmd.SetGlobalVector(AdditionalShadowsConstantBuffer._AdditionalShadowOffset2, + cmd.SetGlobalVector(AdditionalShadowsConstantBuffer._AdditionalShadowOffset2, new Vector4(-invHalfShadowAtlasWidth, invHalfShadowAtlasHeight, 0.0f, 0.0f)); - cmd.SetGlobalVector(AdditionalShadowsConstantBuffer._AdditionalShadowOffset3, + cmd.SetGlobalVector(AdditionalShadowsConstantBuffer._AdditionalShadowOffset3, new Vector4(invHalfShadowAtlasWidth, invHalfShadowAtlasHeight, 0.0f, 0.0f)); - } // Currently only used when !SHADER_API_MOBILE but risky to not set them as it's generic // enough so custom shaders might use it. diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/MainLightShadowCasterPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/MainLightShadowCasterPass.cs index 5afe3b6a859..71ae4acfc23 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/MainLightShadowCasterPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/MainLightShadowCasterPass.cs @@ -29,7 +29,6 @@ private static class MainLightShadowConstantBuffer float m_CascadeBorder; float m_MaxShadowDistanceSq; int m_ShadowCasterCascadesCount; - bool m_SupportsBoxFilterForShadows; RenderTargetHandle m_MainLightShadowmap; internal RenderTexture m_MainLightShadowmapTexture; @@ -65,7 +64,6 @@ public MainLightShadowCasterPass(RenderPassEvent evt) MainLightShadowConstantBuffer._ShadowmapSize = Shader.PropertyToID("_MainLightShadowmapSize"); m_MainLightShadowmap.Init("_MainLightShadowmapTexture"); - m_SupportsBoxFilterForShadows = Application.isMobilePlatform || SystemInfo.graphicsDeviceType == GraphicsDeviceType.Switch; } public bool Setup(ref RenderingData renderingData) @@ -284,17 +282,14 @@ void SetupMainLightShadowReceiverConstants(CommandBuffer cmd, VisibleLight shado // This workaround will be removed once we will support soft shadows per light. if (supportsSoftShadows) { - if (m_SupportsBoxFilterForShadows) - { - cmd.SetGlobalVector(MainLightShadowConstantBuffer._ShadowOffset0, - new Vector4(-invHalfShadowAtlasWidth, -invHalfShadowAtlasHeight, 0.0f, 0.0f)); - cmd.SetGlobalVector(MainLightShadowConstantBuffer._ShadowOffset1, - new Vector4(invHalfShadowAtlasWidth, -invHalfShadowAtlasHeight, 0.0f, 0.0f)); - cmd.SetGlobalVector(MainLightShadowConstantBuffer._ShadowOffset2, - new Vector4(-invHalfShadowAtlasWidth, invHalfShadowAtlasHeight, 0.0f, 0.0f)); - cmd.SetGlobalVector(MainLightShadowConstantBuffer._ShadowOffset3, - new Vector4(invHalfShadowAtlasWidth, invHalfShadowAtlasHeight, 0.0f, 0.0f)); - } + cmd.SetGlobalVector(MainLightShadowConstantBuffer._ShadowOffset0, + new Vector4(-invHalfShadowAtlasWidth, -invHalfShadowAtlasHeight, 0.0f, 0.0f)); + cmd.SetGlobalVector(MainLightShadowConstantBuffer._ShadowOffset1, + new Vector4(invHalfShadowAtlasWidth, -invHalfShadowAtlasHeight, 0.0f, 0.0f)); + cmd.SetGlobalVector(MainLightShadowConstantBuffer._ShadowOffset2, + new Vector4(-invHalfShadowAtlasWidth, invHalfShadowAtlasHeight, 0.0f, 0.0f)); + cmd.SetGlobalVector(MainLightShadowConstantBuffer._ShadowOffset3, + new Vector4(invHalfShadowAtlasWidth, invHalfShadowAtlasHeight, 0.0f, 0.0f)); // Currently only used when !SHADER_API_MOBILE but risky to not set them as it's generic // enough so custom shaders might use it. diff --git a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs index b18dcb6429a..973da972dc4 100644 --- a/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs +++ b/com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs @@ -951,8 +951,7 @@ void DoLensFlareDatadriven(Camera camera, CommandBuffer cmd, RenderTargetIdentif // Zero out the translation component. gpuView.SetColumn(3, new Vector4(0, 0, 0, 1)); var gpuVP = gpuNonJitteredProj * camera.worldToCameraMatrix; - - LensFlareCommonSRP.DoLensFlareDataDrivenCommon(m_Materials.lensFlareDataDriven, LensFlareCommonSRP.Instance, camera, (float)Screen.width, (float)Screen.height, + LensFlareCommonSRP.DoLensFlareDataDrivenCommon(m_Materials.lensFlareDataDriven, LensFlareCommonSRP.Instance, camera, (float)m_Descriptor.width, (float)m_Descriptor.height, usePanini, paniniDistance, paniniCropToFit, true, camera.transform.position, diff --git a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs index 8d2ac09d780..9f94e9381bb 100644 --- a/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs +++ b/com.unity.render-pipelines.universal/Runtime/RendererFeatures/DecalRendererFeature.cs @@ -341,7 +341,6 @@ private void RecreateSystemsIfNeeded(ScriptableRenderer renderer, in CameraData m_ScreenSpaceSettings = GetScreenSpaceSettings(); m_CopyDepthMaterial = CoreUtils.CreateEngineMaterial(m_CopyDepthPS); - m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingPrePasses, m_CopyDepthMaterial); m_DBufferClearMaterial = CoreUtils.CreateEngineMaterial(m_DBufferClear); @@ -371,7 +370,6 @@ private void RecreateSystemsIfNeeded(ScriptableRenderer renderer, in CameraData switch (m_Technique) { case DecalTechnique.ScreenSpace: - m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingOpaques, m_DBufferClearMaterial); m_DecalDrawScreenSpaceSystem = new DecalDrawScreenSpaceSystem(m_DecalEntityManager); m_ScreenSpaceDecalRenderPass = new DecalScreenSpaceRenderPass(m_ScreenSpaceSettings, intermediateRendering ? m_DecalDrawScreenSpaceSystem : null); break; @@ -380,12 +378,12 @@ private void RecreateSystemsIfNeeded(ScriptableRenderer renderer, in CameraData m_DeferredLights = universalRenderer.deferredLights; - m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingOpaques, m_DBufferClearMaterial); m_DrawGBufferSystem = new DecalDrawGBufferSystem(m_DecalEntityManager); m_GBufferRenderPass = new DecalGBufferRenderPass(m_ScreenSpaceSettings, intermediateRendering ? m_DrawGBufferSystem : null); break; case DecalTechnique.DBuffer: + m_CopyDepthPass = new CopyDepthPass(RenderPassEvent.AfterRenderingPrePasses, m_CopyDepthMaterial); m_DecalDrawDBufferSystem = new DecalDrawDBufferSystem(m_DecalEntityManager); m_DBufferRenderPass = new DBufferRenderPass(m_DBufferClearMaterial, m_DBufferSettings, m_DecalDrawDBufferSystem); @@ -471,15 +469,17 @@ public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingD if (universalRenderer.actualRenderingMode == RenderingMode.Deferred) { m_CopyDepthPass.Setup( - new RenderTargetHandle(m_DBufferRenderPass.cameraDepthAttachmentIndentifier), - new RenderTargetHandle(m_DBufferRenderPass.cameraDepthTextureIndentifier) + m_DBufferRenderPass.cameraDepthAttachment, + m_DBufferRenderPass.cameraDepthTexture ); + + m_CopyDepthPass.AllocateRT = false; } else { m_CopyDepthPass.Setup( - new RenderTargetHandle(m_DBufferRenderPass.cameraDepthTextureIndentifier), - new RenderTargetHandle(m_DBufferRenderPass.dBufferDepthIndentifier) + m_DBufferRenderPass.cameraDepthTexture, + m_DBufferRenderPass.dBufferDepth ); m_CopyDepthPass.CopyToDepth = true; diff --git a/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs b/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs index a95dcb4bd33..c2d573d7713 100644 --- a/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs +++ b/com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs @@ -218,7 +218,7 @@ void SetPerCameraShaderVariables(CommandBuffer cmd, ref CameraData cameraData) cmd.SetGlobalVector(ShaderPropertyId.zBufferParams, zBufferParams); cmd.SetGlobalVector(ShaderPropertyId.orthoParams, orthoParams); - cmd.SetGlobalVector(ShaderPropertyId.screenSize, new Vector4(cameraWidth, cameraHeight, 1.0f / cameraWidth, 1.0f / cameraHeight)); + cmd.SetGlobalVector(ShaderPropertyId.screenSize, new Vector4(scaledCameraWidth, scaledCameraHeight, 1.0f / scaledCameraWidth, 1.0f / scaledCameraHeight)); } /// diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs index 504730cf2fe..40793a01d08 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs @@ -572,6 +572,19 @@ static RenderTextureDescriptor CreateRenderTextureDescriptor(Camera camera, floa desc.bindMS = false; desc.useDynamicScale = camera.allowDynamicResolution; + // The way RenderTextures handle MSAA fallback when an unsupported sample count of 2 is requested (falling back to numSamples = 1), differs fom the way + // the fallback is handled when setting up the Vulkan swapchain (rounding up numSamples to 4, if supported). This caused an issue on Mali GPUs which don't support + // 2x MSAA. + // The following code makes sure that on Vulkan the MSAA unsupported fallback behaviour is consistent between RenderTextures and Swapchain. + // TODO: we should review how all backends handle MSAA fallbacks and move these implementation details in engine code. + if (SystemInfo.graphicsDeviceType == GraphicsDeviceType.Vulkan) + { + // if the requested number of samples is 2, and the supported value is 1x, it means that 2x is unsupported on this GPU. + // Then we bump up the requested value to 4. + if (desc.msaaSamples == 2 && SystemInfo.GetRenderTextureSupportedMSAASampleCount(desc) == 1) + desc.msaaSamples = 4; + } + // check that the requested MSAA samples count is supported by the current platform. If it's not supported, // replace the requested desc.msaaSamples value with the actual value the engine falls back to desc.msaaSamples = SystemInfo.GetRenderTextureSupportedMSAASampleCount(desc); diff --git a/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs b/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs index ad1d674631d..e1ae93b5a68 100644 --- a/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs +++ b/com.unity.render-pipelines.universal/Runtime/UniversalRenderer.cs @@ -1127,7 +1127,7 @@ bool CanCopyDepth(ref CameraData cameraData) // copying depth on GLES3 is giving invalid results. Needs investigation (Fogbugz issue 1339401) if (SystemInfo.graphicsDeviceType == GraphicsDeviceType.OpenGLES3) - msaaDepthResolve = false; + return false; return supportsDepthCopy || msaaDepthResolve; } diff --git a/com.unity.render-pipelines.universal/Shaders/2D/Include/CombinedShapeLightShared.hlsl b/com.unity.render-pipelines.universal/Shaders/2D/Include/CombinedShapeLightShared.hlsl index a005f23d3a2..9f049e71dda 100644 --- a/com.unity.render-pipelines.universal/Shaders/2D/Include/CombinedShapeLightShared.hlsl +++ b/com.unity.render-pipelines.universal/Shaders/2D/Include/CombinedShapeLightShared.hlsl @@ -24,7 +24,8 @@ half4 CombinedShapeLightShared(in SurfaceData2D surfaceData, in InputData2D inpu const half4 mask = surfaceData.mask; const half2 lightingUV = inputData.lightingUV; - AlphaDiscard(alpha, 0); + if (alpha == 0.0) + discard; color = color * _RendererColor; // This is needed for sprite shape diff --git a/com.unity.render-pipelines.universal/Shaders/Decal.shadergraph b/com.unity.render-pipelines.universal/Shaders/Decal.shadergraph index dc29db12650..89763d3ace9 100644 --- a/com.unity.render-pipelines.universal/Shaders/Decal.shadergraph +++ b/com.unity.render-pipelines.universal/Shaders/Decal.shadergraph @@ -34,31 +34,31 @@ "m_Id": "a6fc5c3eaf9d4c969be6a69fade9c1a1" }, { - "m_Id": "92a584d0cf0b4005b700ae91558fc595" + "m_Id": "7388a7ddbf6648ec92c3bb54ed055048" }, { - "m_Id": "e2ddf05db7b64f159f1df217b36d871d" + "m_Id": "9f1059a7a93a46ccab349515214f3ed2" }, { - "m_Id": "72199437cb87418283ba9bc457a6dc50" + "m_Id": "1300b7cb738f4b18927411750039acd2" }, { - "m_Id": "1a1a5dd064104aada905b7372694e456" + "m_Id": "360e6833e8d64d75827ab98987b2b545" }, { - "m_Id": "7388a7ddbf6648ec92c3bb54ed055048" + "m_Id": "91d01e73dcf34e7d96a9e731fb50e308" }, { - "m_Id": "9f1059a7a93a46ccab349515214f3ed2" + "m_Id": "86a3eb218544413fb0fe50b275affa91" }, { - "m_Id": "1300b7cb738f4b18927411750039acd2" + "m_Id": "5c44c94deda840389e36349ee92db7ea" }, { - "m_Id": "360e6833e8d64d75827ab98987b2b545" + "m_Id": "2413c9d67fba4ee19cec634df799a0f9" }, { - "m_Id": "91d01e73dcf34e7d96a9e731fb50e308" + "m_Id": "009bf2a731304616a3bbcad7d7d2153c" } ], "m_GroupDatas": [], @@ -115,7 +115,7 @@ }, "m_InputSlot": { "m_Node": { - "m_Id": "f7cbdde7910e4ccda1328a49cd313b32" + "m_Id": "86a3eb218544413fb0fe50b275affa91" }, "m_SlotId": 0 } @@ -123,9 +123,23 @@ { "m_OutputSlot": { "m_Node": { - "m_Id": "91d01e73dcf34e7d96a9e731fb50e308" + "m_Id": "7388a7ddbf6648ec92c3bb54ed055048" + }, + "m_SlotId": 7 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "f7cbdde7910e4ccda1328a49cd313b32" }, "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "86a3eb218544413fb0fe50b275affa91" + }, + "m_SlotId": 2 }, "m_InputSlot": { "m_Node": { @@ -134,6 +148,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "91d01e73dcf34e7d96a9e731fb50e308" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "86a3eb218544413fb0fe50b275affa91" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -154,7 +182,17 @@ "x": 0.0, "y": 0.0 }, - "m_Blocks": [] + "m_Blocks": [ + { + "m_Id": "5c44c94deda840389e36349ee92db7ea" + }, + { + "m_Id": "2413c9d67fba4ee19cec634df799a0f9" + }, + { + "m_Id": "009bf2a731304616a3bbcad7d7d2153c" + } + ] }, "m_FragmentContext": { "m_Position": { @@ -173,18 +211,6 @@ }, { "m_Id": "a6fc5c3eaf9d4c969be6a69fade9c1a1" - }, - { - "m_Id": "92a584d0cf0b4005b700ae91558fc595" - }, - { - "m_Id": "e2ddf05db7b64f159f1df217b36d871d" - }, - { - "m_Id": "72199437cb87418283ba9bc457a6dc50" - }, - { - "m_Id": "1a1a5dd064104aada905b7372694e456" } ] }, @@ -192,7 +218,8 @@ "serializedMesh": { "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", "m_Guid": "" - } + }, + "preventRotation": false }, "m_Path": "Shader Graphs", "m_GraphPrecision": 1, @@ -207,6 +234,63 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "009bf2a731304616a3bbcad7d7d2153c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "09d140abcb0a4aeeab2a87dcf46270a8" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "09d140abcb0a4aeeab2a87dcf46270a8", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -236,6 +320,54 @@ "m_DefaultType": 0 } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "0aa332efc109427fb4241dc37ceac3c1", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", @@ -329,9 +461,9 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_TextureType": 0, + "m_TextureType": 1, "m_NormalMapSpace": 0, - "m_DisableGlobalMipBias": false + "m_EnableGlobalMipBias": true } { @@ -375,11 +507,11 @@ { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "1a1a5dd064104aada905b7372694e456", + "m_ObjectId": "2413c9d67fba4ee19cec634df799a0f9", "m_Group": { "m_Id": "" }, - "m_Name": "SurfaceDescription.MAOSAlpha", + "m_Name": "VertexDescription.Normal", "m_DrawState": { "m_Expanded": true, "m_Position": { @@ -392,7 +524,7 @@ }, "m_Slots": [ { - "m_Id": "29d2ab94680f4f7b8c0c7213fa03e25e" + "m_Id": "3a4e57dcc89147529d49da145c2cf89f" } ], "synonyms": [], @@ -402,37 +534,7 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_SerializedDescriptor": "SurfaceDescription.MAOSAlpha" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "2645890f46784786b0a8402519a73a9b", - "m_Id": 0, - "m_DisplayName": "Smoothness", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Smoothness", - "m_StageCapability": 2, - "m_Value": 0.5, - "m_DefaultValue": 0.5, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "29d2ab94680f4f7b8c0c7213fa03e25e", - "m_Id": 0, - "m_DisplayName": "MAOS Alpha", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "MAOSAlpha", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] + "m_SerializedDescriptor": "VertexDescription.Normal" } { @@ -513,6 +615,30 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "33b9bc54284a42a891a7a8549946f919", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -561,6 +687,30 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "3a4e57dcc89147529d49da145c2cf89f", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", @@ -647,6 +797,39 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5c44c94deda840389e36349ee92db7ea", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "33b9bc54284a42a891a7a8549946f919" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -662,21 +845,6 @@ "m_Labels": [] } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "5f6cdb7cfacb4ad8a147d81a33c384e9", - "m_Id": 0, - "m_DisplayName": "Ambient Occlusion", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Occlusion", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - { "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", @@ -693,7 +861,56 @@ "m_AlphaClip": false, "m_CastShadows": true, "m_ReceiveShadows": true, - "m_CustomEditorGUI": "" + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "603878f203a14c6ab96789f762db855d", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } } { @@ -751,21 +968,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "66a1294041d244b89724b6fcb7fe2861", - "m_Id": 0, - "m_DisplayName": "Metallic", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Metallic", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -803,39 +1005,6 @@ "m_Channel": 0 } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "72199437cb87418283ba9bc457a6dc50", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Smoothness", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "2645890f46784786b0a8402519a73a9b" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Smoothness" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", @@ -889,7 +1058,7 @@ }, "m_TextureType": 0, "m_NormalMapSpace": 0, - "m_DisableGlobalMipBias": false + "m_EnableGlobalMipBias": true } { @@ -907,7 +1076,7 @@ "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", "m_Guid": "" }, - "m_DefaultType": 0 + "m_DefaultType": 3 } { @@ -936,75 +1105,82 @@ { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "8939b04c72d84f60bccf2b92303263a8", - "m_Id": 0, - "m_DisplayName": "Alpha", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Alpha", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "91d01e73dcf34e7d96a9e731fb50e308", + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "86a3eb218544413fb0fe50b275affa91", "m_Group": { "m_Id": "" }, - "m_Name": "Property", + "m_Name": "Multiply", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -310.4757995605469, - "y": 768.4763793945313, - "width": 0.0, - "height": 0.0 + "x": -144.40000915527345, + "y": 509.199951171875, + "width": 125.60000610351563, + "height": 118.0 } }, "m_Slots": [ { - "m_Id": "a712e2b34f9e410da027e4db3100c57a" + "m_Id": "0aa332efc109427fb4241dc37ceac3c1" + }, + { + "m_Id": "b78ccfe8888c45e18b1f721cf532f926" + }, + { + "m_Id": "603878f203a14c6ab96789f762db855d" } ], - "synonyms": [], + "synonyms": [ + "multiplication", + "times", + "x" + ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "0cff3d33c0704eb597988232e81f81de" } } { "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "92a584d0cf0b4005b700ae91558fc595", + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8939b04c72d84f60bccf2b92303263a8", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "91d01e73dcf34e7d96a9e731fb50e308", "m_Group": { "m_Id": "" }, - "m_Name": "SurfaceDescription.Metallic", + "m_Name": "Property", "m_DrawState": { "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 + "x": -317.1999816894531, + "y": 743.9999389648438, + "width": 145.19998168945313, + "height": 34.0 } }, "m_Slots": [ { - "m_Id": "66a1294041d244b89724b6fcb7fe2861" + "m_Id": "a712e2b34f9e410da027e4db3100c57a" } ], "synonyms": [], @@ -1014,7 +1190,9 @@ "m_CustomColors": { "m_SerializableColors": [] }, - "m_SerializedDescriptor": "SurfaceDescription.Metallic" + "m_Property": { + "m_Id": "0cff3d33c0704eb597988232e81f81de" + } } { @@ -1160,6 +1338,54 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "b78ccfe8888c45e18b1f721cf532f926", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -1221,39 +1447,6 @@ } } -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "e2ddf05db7b64f159f1df217b36d871d", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Occlusion", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "5f6cdb7cfacb4ad8a147d81a33c384e9" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Occlusion" -} - { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BlockNode", diff --git a/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceAmbientOcclusion.shader b/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceAmbientOcclusion.shader index 2f17042f357..c658bd7c744 100644 --- a/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceAmbientOcclusion.shader +++ b/com.unity.render-pipelines.universal/Shaders/Utils/ScreenSpaceAmbientOcclusion.shader @@ -1,6 +1,7 @@ Shader "Hidden/Universal Render Pipeline/ScreenSpaceAmbientOcclusion" { HLSLINCLUDE + #pragma editor_sync_compilation #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/Common.hlsl" #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/EntityLighting.hlsl" #include "Packages/com.unity.render-pipelines.core/ShaderLibrary/ImageBasedLighting.hlsl" diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/FieldDependencies.cs b/com.unity.shadergraph/Editor/Generation/TargetResources/FieldDependencies.cs index f21bd45ccc0..50e498f0baa 100644 --- a/com.unity.shadergraph/Editor/Generation/TargetResources/FieldDependencies.cs +++ b/com.unity.shadergraph/Editor/Generation/TargetResources/FieldDependencies.cs @@ -92,7 +92,7 @@ internal static class FieldDependencies new FieldDependency(StructFields.SurfaceDescriptionInputs.ObjectSpacePositionPredisplacement, StructFields.Varyings.positionPredisplacementWS), new FieldDependency(StructFields.SurfaceDescriptionInputs.ViewSpacePositionPredisplacement, StructFields.Varyings.positionPredisplacementWS), - new FieldDependency(StructFields.SurfaceDescriptionInputs.WorldSpaceViewDirection, StructFields.Varyings.viewDirectionWS), + new FieldDependency(StructFields.SurfaceDescriptionInputs.WorldSpaceViewDirection, StructFields.Varyings.positionWS), new FieldDependency(StructFields.SurfaceDescriptionInputs.ObjectSpaceViewDirection, StructFields.SurfaceDescriptionInputs.WorldSpaceViewDirection), new FieldDependency(StructFields.SurfaceDescriptionInputs.ViewSpaceViewDirection, StructFields.SurfaceDescriptionInputs.WorldSpaceViewDirection), new FieldDependency(StructFields.SurfaceDescriptionInputs.TangentSpaceViewDirection, StructFields.SurfaceDescriptionInputs.WorldSpaceViewDirection), diff --git a/com.unity.shadergraph/Editor/Generation/TargetResources/StructFields.cs b/com.unity.shadergraph/Editor/Generation/TargetResources/StructFields.cs index 229000f5f41..9c7a8786125 100644 --- a/com.unity.shadergraph/Editor/Generation/TargetResources/StructFields.cs +++ b/com.unity.shadergraph/Editor/Generation/TargetResources/StructFields.cs @@ -53,8 +53,6 @@ public struct Varyings subscriptOptions: StructFieldOptions.Optional); public static FieldDescriptor color = new FieldDescriptor(Varyings.name, "color", "VARYINGS_NEED_COLOR", ShaderValueType.Float4, subscriptOptions: StructFieldOptions.Optional); - public static FieldDescriptor viewDirectionWS = new FieldDescriptor(Varyings.name, "viewDirectionWS", "VARYINGS_NEED_VIEWDIRECTION_WS", ShaderValueType.Float3, - subscriptOptions: StructFieldOptions.Optional); public static FieldDescriptor screenPosition = new FieldDescriptor(Varyings.name, "screenPosition", "VARYINGS_NEED_SCREENPOSITION", ShaderValueType.Float4, subscriptOptions: StructFieldOptions.Optional); public static FieldDescriptor instanceID = new FieldDescriptor(Varyings.name, "instanceID", "", ShaderValueType.Uint, diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs b/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs index 3c41d6a3f8f..d2735b0011b 100644 --- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs +++ b/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/BuiltInStructs.cs @@ -20,7 +20,6 @@ static class BuiltInStructs StructFields.Varyings.texCoord2, StructFields.Varyings.texCoord3, StructFields.Varyings.color, - StructFields.Varyings.viewDirectionWS, StructFields.Varyings.screenPosition, BuiltInStructFields.Varyings.lightmapUV, BuiltInStructFields.Varyings.sh, diff --git a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs b/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs index 9ef5126cd3a..c07c3a3bdd0 100644 --- a/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs +++ b/com.unity.shadergraph/Editor/Generation/Targets/BuiltIn/Editor/ShaderGraph/Targets/BuiltInLitSubTarget.cs @@ -481,7 +481,6 @@ static class LitRequiredFields StructFields.Varyings.positionWS, StructFields.Varyings.normalWS, StructFields.Varyings.tangentWS, // needed for vertex lighting - StructFields.Varyings.viewDirectionWS, BuiltInStructFields.Varyings.lightmapUV, BuiltInStructFields.Varyings.sh, BuiltInStructFields.Varyings.fogFactorAndVertexLight, // fog and vertex lighting, vert input is dependency @@ -494,7 +493,6 @@ static class LitRequiredFields StructFields.Varyings.positionWS, StructFields.Varyings.normalWS, StructFields.Varyings.tangentWS, // needed for vertex lighting - StructFields.Varyings.viewDirectionWS, BuiltInStructFields.Varyings.lightmapUV, BuiltInStructFields.Varyings.sh, BuiltInStructFields.Varyings.fogFactorAndVertexLight, // fog and vertex lighting, vert input is dependency diff --git a/com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs b/com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs index 9cfdd79cddd..20a13d16a6f 100644 --- a/com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs +++ b/com.unity.shadergraph/Editor/Generation/Targets/PreviewTarget.cs @@ -120,7 +120,6 @@ static class StructDescriptors StructFields.Varyings.texCoord2, StructFields.Varyings.texCoord3, StructFields.Varyings.color, - StructFields.Varyings.viewDirectionWS, StructFields.Varyings.screenPosition, StructFields.Varyings.instanceID, StructFields.Varyings.vertexID, diff --git a/com.unity.shadergraph/Editor/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl b/com.unity.shadergraph/Editor/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl index 4ee88a7db2c..0b0f5b88549 100644 --- a/com.unity.shadergraph/Editor/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl +++ b/com.unity.shadergraph/Editor/Generation/Templates/BuildSurfaceDescriptionInputs.template.hlsl @@ -30,7 +30,7 @@ SurfaceDescriptionInputs BuildSurfaceDescriptionInputs(Varyings input) $SurfaceDescriptionInputs.ObjectSpaceBiTangent: output.ObjectSpaceBiTangent = TransformWorldToObjectDir(output.WorldSpaceBiTangent); $SurfaceDescriptionInputs.ViewSpaceBiTangent: output.ViewSpaceBiTangent = TransformWorldToViewDir(output.WorldSpaceBiTangent); $SurfaceDescriptionInputs.TangentSpaceBiTangent: output.TangentSpaceBiTangent = float3(0.0f, 1.0f, 0.0f); - $SurfaceDescriptionInputs.WorldSpaceViewDirection: output.WorldSpaceViewDirection = normalize(input.viewDirectionWS); + $SurfaceDescriptionInputs.WorldSpaceViewDirection: output.WorldSpaceViewDirection = GetWorldSpaceNormalizeViewDir(input.positionWS); $SurfaceDescriptionInputs.ObjectSpaceViewDirection: output.ObjectSpaceViewDirection = TransformWorldToObjectDir(output.WorldSpaceViewDirection); $SurfaceDescriptionInputs.ViewSpaceViewDirection: output.ViewSpaceViewDirection = TransformWorldToViewDir(output.WorldSpaceViewDirection); $SurfaceDescriptionInputs.TangentSpaceViewDirection: float3x3 tangentSpaceTransform = float3x3(output.WorldSpaceTangent,output.WorldSpaceBiTangent,output.WorldSpaceNormal); diff --git a/com.unity.shadergraph/Editor/Generation/Templates/PassMesh.template b/com.unity.shadergraph/Editor/Generation/Templates/PassMesh.template index 9d539415694..331691eb70d 100644 --- a/com.unity.shadergraph/Editor/Generation/Templates/PassMesh.template +++ b/com.unity.shadergraph/Editor/Generation/Templates/PassMesh.template @@ -51,7 +51,6 @@ Pass $Varyings.texCoord3: #define VARYINGS_NEED_TEXCOORD3 $Varyings.color: #define VARYINGS_NEED_COLOR $Varyings.vertexID: #define VARYINGS_NEED_VERTEXID - $Varyings.viewDirectionWS: #define VARYINGS_NEED_VIEWDIRECTION_WS $Varyings.bitangentWS: #define VARYINGS_NEED_BITANGENT_WS $Varyings.screenPosition: #define VARYINGS_NEED_SCREENPOSITION $Varyings.fogFactorAndVertexLight: #define VARYINGS_NEED_FOG_AND_VERTEX_LIGHT diff --git a/com.unity.shadergraph/ShaderGraphLibrary/PreviewVaryings.hlsl b/com.unity.shadergraph/ShaderGraphLibrary/PreviewVaryings.hlsl index de70d27836a..e837a934cf4 100644 --- a/com.unity.shadergraph/ShaderGraphLibrary/PreviewVaryings.hlsl +++ b/com.unity.shadergraph/ShaderGraphLibrary/PreviewVaryings.hlsl @@ -55,10 +55,6 @@ Varyings BuildVaryings(Attributes input) output.vertexID = input.vertexID; #endif -#ifdef VARYINGS_NEED_VIEWDIRECTION_WS - output.viewDirectionWS = _WorldSpaceCameraPos.xyz - positionWS; -#endif - #ifdef VARYINGS_NEED_BITANGENT_WS output.bitangentWS = cross(normalWS, tangentWS.xyz) * tangentWS.w; #endif