Differential D3205 Diff 10536 source/blender/gpu/shaders/gpu_shader_material.glsl

Changeset View

Standalone View

source/blender/gpu/shaders/gpu_shader_material.glsl

Context not available.
	return cl;	return cl;
	}	}

		Closure closure_split(float lighting, Closure cl1, Closure cl2, float fac, float blur)
		{
		Closure cl;

		if(lighting > fac) {
		if(lighting < fac + blur) {
		float percent = clamp((lighting - fac) / ((fac + blur) - fac), 0.0, 1.0);
		cl.radiance = mix(cl2.radiance, cl1.radiance, percent);

		cl.opacity = cl1.opacity;
		}
		else {
		cl.radiance = cl1.radiance;
		cl.opacity = cl1.opacity;
		}
		}
		else {
		cl.radiance = cl2.radiance;
		cl.opacity = cl2.opacity;
		}

		return cl;
		}

	Closure nodetree_exec(void); /* Prototype */	Closure nodetree_exec(void); /* Prototype */

	#endif /* CLOSURE_DEFAULT */	#endif /* CLOSURE_DEFAULT */
Context not available.
	result.radiance *= color.rgb;	result.radiance *= color.rgb;
	}	}

		void node_bsdf_smooth(vec4 color, float contrast, vec3 N, out Closure result)
		{
		vec3 vN = normalize(mat3(ViewMatrix) * N);
		result = CLOSURE_DEFAULT;
		result.ssr_normal = normal_encode(vN, viewCameraVec);
		eevee_closure_diffuse(N, color.rgb, 0.0, result.radiance);
		result.radiance = clamp(result.radiance, 0.0, 1.0) * color.rgb;
		result.radiance.r = pow(result.radiance.r * 0.5 + 0.5, contrast);
		result.radiance.g = pow(result.radiance.g * 0.5 + 0.5, contrast);
		result.radiance.b = pow(result.radiance.b * 0.5 + 0.5, contrast);
		}

	void node_bsdf_glossy(vec4 color, float roughness, vec3 N, float ssr_id, out Closure result)	void node_bsdf_glossy(vec4 color, float roughness, vec3 N, float ssr_id, out Closure result)
	{	{
	vec3 out_spec, ssr_spec;	vec3 out_spec, ssr_spec;
Context not available.
	shader = closure_add(shader1, shader2);	shader = closure_add(shader1, shader2);
	}	}

		void node_slice_shader(Closure lighting, Closure shader1, Closure shader2, float fac, float blur, out Closure shader)
		{
		float grayscale = convert_rgba_to_float(vec4(lighting.radiance, 1.0));
		shader = closure_split(grayscale, shader1, shader2, fac, blur);
		}

		void node_shadertorgb(Closure shader, out vec4 outcol, out float outalpha)
		{
		outcol = vec4(shader.radiance, shader.opacity);
		fclemUnsubmitted Done Inline Actions So this is the same thing the other patch did and that I said is not what we want. We need EVALUATION of the lighting at this point. shader.radiance only contains a part of this lighting. You need to evaluate the glossy reflection from the SSR inputs contained by the Closure. For this look at `fallback_cubemap()` in `effect_ssr_frag.glsl` (we might want to put this function in a shared place). You also need to collapse the SSS input too. All of this need to happen only if Eevee is enabled to put some `#ifdef` in there. fclem: So this is the same thing the other patch did and that I said is not what we want. We need…
		outalpha = shader.opacity;
		}

	/* fresnel */	/* fresnel */

	void node_fresnel(float ior, vec3 N, vec3 I, out float result)	void node_fresnel(float ior, vec3 N, vec3 I, out float result)
Context not available.