From da6e4bfda2ed52ee5183522e32e7dfe2efd9e376 Mon Sep 17 00:00:00 2001 From: notargs Date: Tue, 25 Apr 2023 11:24:26 +0900 Subject: [PATCH] =?UTF-8?q?UNITY=5FDECLARE=5FTEX2D=E3=82=92=E5=9B=9E?= =?UTF-8?q?=E9=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VRM10/vrmc_materials_mtoon_input.hlsl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl index 32a3801fa..f2bed97f5 100644 --- a/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl +++ b/Assets/VRMShaders/VRM10/MToon10/Resources/VRM10/vrmc_materials_mtoon_input.hlsl @@ -8,16 +8,16 @@ #endif // Textures -UNITY_DECLARE_TEX2D(_MainTex); -UNITY_DECLARE_TEX2D(_ShadeTex); -UNITY_DECLARE_TEX2D(_BumpMap); -UNITY_DECLARE_TEX2D(_ShadingShiftTex); -UNITY_DECLARE_TEX2D(_EmissionMap); -UNITY_DECLARE_TEX2D(_MatcapTex); -UNITY_DECLARE_TEX2D(_RimTex); -UNITY_DECLARE_TEX2D(_OutlineWidthTex); +TEXTURE2D(_MainTex); SAMPLER(sampler_MainTex); +TEXTURE2D(_ShadeTex); SAMPLER(sampler_ShadeTex); +TEXTURE2D(_BumpMap); SAMPLER(sampler_BumpMap); +TEXTURE2D(_ShadingShiftTex); SAMPLER(sampler_ShadingShiftTex); +TEXTURE2D(_EmissionMap); SAMPLER(sampler_EmissionMap); +TEXTURE2D(_MatcapTex); SAMPLER(sampler_MatcapTex); +TEXTURE2D(_RimTex); SAMPLER(sampler_RimTex); +TEXTURE2D(_OutlineWidthTex); SAMPLER(sampler_OutlineWidthTex); // NOTE: "tex2d() * _Time.y" returns mediump value if sampler is half precision in Android VR platform -UNITY_DECLARE_TEX2D_FLOAT(_UvAnimMaskTex); +TEXTURE2D_FLOAT(_UvAnimMaskTex); SAMPLER(sampler_UvAnimMaskTex); CBUFFER_START(UnityPerMaterial) // Vector