use texLod for texcture lookup

Filip Iliescu · Filip Iliescu · commit 1a91b0356613 · 2017-06-15T15:26:44.000-07:00
diff --git a/Assets/ScriptableRenderPipeline/MobileRenderPipeline/ClassicDeferred/ClassicDeferredPipeline.cs b/Assets/ScriptableRenderPipeline/MobileRenderPipeline/ClassicDeferred/ClassicDeferredPipeline.cs
@@ -948,16 +948,20 @@ private void SetupLightShaderVariables(CullResults cull, Camera camera, Scriptab
 		//eyePlane.SetNormalAndPosition(viewDirNormalized, camera.transform.position);
 
 		int probeCount = cull.visibleReflectionProbes.Length;
+		int finalProbeCount = probeCount;
 		var lightData = new SFiniteLightData[probeCount];
+		int idx = 0;
 
 		for (int i = 0; i < probeCount; ++i) {
 			var rl = cull.visibleReflectionProbes [i];
 
 			// always a box for now
 			var cubemap = rl.texture;
-			if (cubemap == null)
+			if (cubemap == null) {
+				Debug.Log ("empty cubemap texture");
+				finalProbeCount--;
 				continue;
-
+			}
 			var lgtData = new SFiniteLightData();
 			lgtData.flags = 0;
 
@@ -1007,7 +1011,7 @@ private void SetupLightShaderVariables(CullResults cull, Camera camera, Scriptab
 			lgtData.lightType = (uint)LightDefinitions.BOX_LIGHT;
 			lgtData.lightModel = (uint)LightDefinitions.REFLECTION_LIGHT;
 
-			lightData [i] = lgtData;
+			lightData [idx++] = lgtData;
 		}
 
 		s_LightDataBuffer.SetData(lightData);
@@ -1025,7 +1029,7 @@ private void SetupLightShaderVariables(CullResults cull, Camera camera, Scriptab
 		cmd.SetGlobalVectorArray("gLightPos", m_LightPositions);
 		cmd.SetGlobalMatrixArray("gLightMatrix", m_LightMatrix);
 		cmd.SetGlobalMatrixArray("gWorldToLightMatrix", m_WorldToLightMatrix);
-		cmd.SetGlobalVector("gLightData", new Vector4(totalLightCount, probeCount, 0, 0));
+		cmd.SetGlobalVector("gLightData", new Vector4(totalLightCount, finalProbeCount, 0, 0));
 
 		cmd.SetGlobalTexture("_spotCookieTextures", m_CookieTexArray.GetTexCache());
 		//cmd.SetGlobalTexture("_pointCookieTextures", m_CubeCookieTexArray.GetTexCache());
diff --git a/Assets/ScriptableRenderPipeline/MobileRenderPipeline/ClassicDeferred/UnityStandardForwardMobile.cginc b/Assets/ScriptableRenderPipeline/MobileRenderPipeline/ClassicDeferred/UnityStandardForwardMobile.cginc
@@ -236,7 +236,6 @@ float3 RenderReflectionList(uint start, uint numReflProbes, float3 vP, float3 vN
 
         half3 env0 = Unity_GlossyEnvironment(UNITY_PASS_ABSTRACT_CUBE_ARRAY(_reflCubeTextures), lgtDat.sliceIndex, float4(lgtDat.lightIntensity, lgtDat.decodeExp, 0.0, 0.0), g);
 
-
         UnityIndirect ind;
         ind.diffuse = 0;
         ind.specular = env0;// * data.occlusion;
@@ -252,7 +251,6 @@ float3 RenderReflectionList(uint start, uint numReflProbes, float3 vP, float3 vN
         half falloff = saturate(1.0 - length(distance)/blendDistance);
 
         ints = lerp(ints, rgb, falloff);
-
     }
 
     return ints;
@@ -390,7 +388,7 @@ float3 RenderLightList(uint start, uint numLights, float3 vPw, float3 Vworld)
 
             // distance atten
 			float att = dot(toLight, toLight) * gLightPos[lightIndex].w;
-			float atten = tex2D (_LightTextureB0, att.rr).UNITY_ATTEN_CHANNEL;
+			float atten = tex2Dlod (_LightTextureB0, float4(att.rr, 0.0, 0.0)).UNITY_ATTEN_CHANNEL;
 
             // For debug: spot attenuation -- programatic no cookie
             //const float fProjVec = -dot(vL, gLightDirection[lightIndex].xyz);        // spotDir = lgtDat.lightAxisZ.xyz
