X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=shaderlib%2Fcooktorrance.glsl;h=33035ee3fa03a0b5b703ef692e710baeac336f5f;hb=f157c4fa40d3f771f00fcb20ba128a37d61c6970;hp=89b4c99c3156db1f98aa88b37436b915df9cf008;hpb=842c817bb679a5a0abc05e8149e2e6e0ae1a0412;p=libs%2Fgl.git

diff --git a/shaderlib/cooktorrance.glsl b/shaderlib/cooktorrance.glsl
index 89b4c99c..33035ee3 100644
--- a/shaderlib/cooktorrance.glsl
+++ b/shaderlib/cooktorrance.glsl
@@ -2,6 +2,25 @@ import msp_interface;
 import common;
 import shadow;
 
+struct PbrMaterialParameters
+{
+	vec4 base_color;
+	vec4 emission;
+	float metalness;
+	float roughness;
+};
+
+uniform PbrMaterial
+{
+	PbrMaterialParameters pbr_material;
+};
+
+uniform sampler2D base_color_map;
+uniform sampler2D metalness_map;
+uniform sampler2D roughness_map;
+uniform sampler2D occlusion_map;
+uniform sampler2D emission_map;
+
 layout(constant_id=auto) const bool use_base_color_map = false;
 layout(constant_id=auto) const bool use_metalness_map = false;
 layout(constant_id=auto) const bool use_roughness_map = false;
@@ -12,7 +31,7 @@ layout(constant_id=auto) const bool use_emission_map = false;
 const float PI = 3.1415926535;
 
 #pragma MSP stage(fragment)
-vec4 get_base_color()
+virtual vec4 get_base_color()
 {
 	if(use_base_color_map)
 		return texture(base_color_map, texcoord.xy);
@@ -20,7 +39,7 @@ vec4 get_base_color()
 		return pbr_material.base_color;
 }
 
-float get_metalness_value()
+virtual float get_metalness_value()
 {
 	if(use_metalness_map)
 		return texture(metalness_map, texcoord.xy).r;
@@ -28,7 +47,7 @@ float get_metalness_value()
 		return pbr_material.metalness;
 }
 
-float get_roughness_value()
+virtual float get_roughness_value()
 {
 	if(use_roughness_map)
 		return texture(roughness_map, texcoord.xy).r;
@@ -36,7 +55,7 @@ float get_roughness_value()
 		return pbr_material.roughness;
 }
 
-float get_occlusion_value()
+virtual float get_occlusion_value()
 {
 	if(use_occlusion_map)
 		return texture(occlusion_map, texcoord.xy).r;
@@ -44,7 +63,7 @@ float get_occlusion_value()
 		return 1.0;
 }
 
-vec3 get_emission_color()
+virtual vec3 get_emission_color()
 {
 	if(use_emission_map)
 		return texture(emission_map, texcoord.xy).rgb;