diff options
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 13 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 59 | ||||
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_material.glsl | 68 |
4 files changed, 129 insertions, 13 deletions
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 29da72a00fe..63e5f64e6bc 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -133,6 +133,7 @@ void GPU_material_bind(GPUMaterial *material, int oblay, int viewlay, double tim void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[4][4], float obcol[4], float autobumpscale); void GPU_material_unbind(GPUMaterial *material); int GPU_material_bound(GPUMaterial *material); +struct Scene *GPU_material_scene(GPUMaterial *material); void GPU_material_vertex_attributes(GPUMaterial *material, struct GPUVertexAttribs *attrib); @@ -166,6 +167,7 @@ typedef enum GPUDynamicType { GPU_DYNAMIC_OBJECT_IMAT = 4, GPU_DYNAMIC_OBJECT_COLOR = 5, GPU_DYNAMIC_OBJECT_AUTOBUMPSCALE = 15, + GPU_DYNAMIC_LAMP_FIRST = 6, GPU_DYNAMIC_LAMP_DYNVEC = 6, GPU_DYNAMIC_LAMP_DYNCO = 7, @@ -177,11 +179,11 @@ typedef enum GPUDynamicType { GPU_DYNAMIC_SAMPLER_2DBUFFER = 12, GPU_DYNAMIC_SAMPLER_2DIMAGE = 13, GPU_DYNAMIC_SAMPLER_2DSHADOW = 14, - GPU_DYNAMIC_LAMP_DISTANCE = 15, - GPU_DYNAMIC_LAMP_ATT1 = 16, - GPU_DYNAMIC_LAMP_ATT2 = 17, - GPU_DYNAMIC_LAMP_SPOTSIZE = 18, - GPU_DYNAMIC_LAMP_SPOTBLEND = 19, + GPU_DYNAMIC_LAMP_DISTANCE = 16, + GPU_DYNAMIC_LAMP_ATT1 = 17, + GPU_DYNAMIC_LAMP_ATT2 = 18, + GPU_DYNAMIC_LAMP_SPOTSIZE = 19, + GPU_DYNAMIC_LAMP_SPOTBLEND = 20, } GPUDynamicType; typedef enum GPUDataType { @@ -244,6 +246,7 @@ void GPU_lamp_update_colors(GPULamp *lamp, float r, float g, float b, float ener void GPU_lamp_update_distance(GPULamp *lamp, float distance, float att1, float att2); void GPU_lamp_update_spot(GPULamp *lamp, float spotsize, float spotblend); int GPU_lamp_shadow_layer(GPULamp *lamp); +GPUNodeLink *GPU_lamp_get_data(GPUMaterial *mat, GPULamp *lamp, GPUNodeLink **col, GPUNodeLink **lv, GPUNodeLink **dist, GPUNodeLink **shadow); #ifdef __cplusplus } diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 0d25d988df9..0dba2cd50e8 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -1784,7 +1784,7 @@ int GPU_scene_object_lights(Scene *scene, Object *ob, int lay, float viewmat[4][ /* spot lamp */ negate_v3_v3(direction, base->object->obmat[2]); glLightfv(GL_LIGHT0+count, GL_SPOT_DIRECTION, direction); - glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, la->spotsize/2.0f); + glLightf(GL_LIGHT0+count, GL_SPOT_CUTOFF, RAD2DEGF(la->spotsize * 0.5f)); glLightf(GL_LIGHT0+count, GL_SPOT_EXPONENT, 128.0f*la->spotblend); } else diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index ed7a2f4ede0..a3813ef4584 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -355,6 +355,11 @@ int GPU_material_bound(GPUMaterial *material) return material->bound; } +Scene *GPU_material_scene(GPUMaterial *material) +{ + return material->scene; +} + void GPU_material_vertex_attributes(GPUMaterial *material, GPUVertexAttribs *attribs) { *attribs = material->attribs; @@ -1664,8 +1669,8 @@ void GPU_lamp_update_distance(GPULamp *lamp, float distance, float att1, float a void GPU_lamp_update_spot(GPULamp *lamp, float spotsize, float spotblend) { - lamp->spotsi= cosf((float)M_PI * spotsize / 360.0f); - lamp->spotbl= (1.0f - lamp->spotsi) * spotblend; + lamp->spotsi = cosf(spotsize * 0.5f); + lamp->spotbl = (1.0f - lamp->spotsi) * spotblend; } static void gpu_lamp_from_blender(Scene *scene, Object *ob, Object *par, Lamp *la, GPULamp *lamp) @@ -1690,11 +1695,11 @@ static void gpu_lamp_from_blender(Scene *scene, Object *ob, Object *par, Lamp *l GPU_lamp_update(lamp, ob->lay, (ob->restrictflag & OB_RESTRICT_RENDER), ob->obmat); - lamp->spotsi= la->spotsize; + lamp->spotsi = la->spotsize; if (lamp->mode & LA_HALO) - if (lamp->spotsi > 170.0f) - lamp->spotsi = 170.0f; - lamp->spotsi= cosf((float)M_PI*lamp->spotsi/360.0f); + if (lamp->spotsi > DEG2RADF(170.0f)) + lamp->spotsi = DEG2RADF(170.0f); + lamp->spotsi = cosf(lamp->spotsi * 0.5f); lamp->spotbl= (1.0f - lamp->spotsi)*la->spotblend; lamp->k= la->k; @@ -1953,6 +1958,48 @@ int GPU_lamp_shadow_layer(GPULamp *lamp) return -1; } +GPUNodeLink *GPU_lamp_get_data(GPUMaterial *mat, GPULamp *lamp, GPUNodeLink **col, GPUNodeLink **lv, GPUNodeLink **dist, GPUNodeLink **shadow) +{ + GPUNodeLink *visifac; + + *col = GPU_dynamic_uniform(lamp->dyncol, GPU_DYNAMIC_LAMP_DYNCOL, lamp->ob); + visifac = lamp_get_visibility(mat, lamp, lv, dist); + shade_light_textures(mat, lamp, col); + + if (GPU_lamp_has_shadow_buffer(lamp)) { + GPUNodeLink *vn, *inp; + + GPU_link(mat, "shade_norm", GPU_builtin(GPU_VIEW_NORMAL), &vn); + GPU_link(mat, "shade_inp", vn, *lv, &inp); + mat->dynproperty |= DYN_LAMP_PERSMAT; + + if (lamp->la->shadowmap_type == LA_SHADMAP_VARIANCE) { + GPU_link(mat, "shadows_only_vsm", + GPU_builtin(GPU_VIEW_POSITION), + GPU_dynamic_texture(lamp->tex, GPU_DYNAMIC_SAMPLER_2DSHADOW, lamp->ob), + GPU_dynamic_uniform((float*)lamp->dynpersmat, GPU_DYNAMIC_LAMP_DYNPERSMAT, lamp->ob), + GPU_uniform(&lamp->bias), GPU_uniform(&lamp->la->bleedbias), + GPU_uniform(lamp->shadow_color), inp, shadow); + } + else { + GPU_link(mat, "shadows_only", + GPU_builtin(GPU_VIEW_POSITION), + GPU_dynamic_texture(lamp->tex, GPU_DYNAMIC_SAMPLER_2DSHADOW, lamp->ob), + GPU_dynamic_uniform((float*)lamp->dynpersmat, GPU_DYNAMIC_LAMP_DYNPERSMAT, lamp->ob), + GPU_uniform(&lamp->bias), GPU_uniform(lamp->shadow_color), inp, shadow); + } + } + else { + GPU_link(mat, "set_rgb_one", shadow); + } + + /* ensure shadow buffer and lamp textures will be updated */ + add_user_list(&mat->lamps, lamp); + add_user_list(&lamp->materials, mat->ma); + + return visifac; +} + /* export the GLSL shader */ GPUShaderExport *GPU_shader_export(struct Scene *scene, struct Material *ma) diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index 5e5fac3049c..3a4aa75aa01 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -140,7 +140,7 @@ void uv_attribute(vec2 attuv, out vec3 uv) void geom(vec3 co, vec3 nor, mat4 viewinvmat, vec3 attorco, vec2 attuv, vec4 attvcol, out vec3 global, out vec3 local, out vec3 view, out vec3 orco, out vec3 uv, out vec3 normal, out vec4 vcol, out float vcol_alpha, out float frontback) { local = co; - view = normalize(local); + view = (gl_ProjectionMatrix[3][3] == 0.0)? normalize(local): vec3(0.0, 0.0, -1.0); global = (viewinvmat*vec4(local, 1.0)).xyz; orco = attorco; uv_attribute(attuv, uv); @@ -166,6 +166,15 @@ void camera(vec3 co, out vec3 outview, out float outdepth, out float outdist) outview = normalize(co); } +void lamp(vec4 col, vec3 lv, float dist, vec3 shadow, float visifac, out vec4 outcol, out vec3 outlv, out float outdist, out vec4 outshadow, out float outvisifac) +{ + outcol = col; + outlv = lv; + outdist = dist; + outshadow = vec4(shadow, 1.0); + outvisifac = visifac; +} + void math_add(float val1, float val2, out float outval) { outval = val1 + val2; @@ -735,6 +744,21 @@ void combine_rgb(float r, float g, float b, out vec4 col) col = vec4(r, g, b, 1.0); } +void separate_hsv(vec4 col, out float h, out float s, out float v) +{ + vec4 hsv; + + rgb_to_hsv(col, hsv); + h = hsv[0]; + s = hsv[1]; + v = hsv[2]; +} + +void combine_hsv(float h, float s, float v, out vec4 col) +{ + hsv_to_rgb(vec4(h, s, v, 1.0), col); +} + void output_node(vec4 rgb, float alpha, out vec4 outrgb) { outrgb = vec4(rgb.rgb, alpha); @@ -1958,6 +1982,30 @@ void test_shadowbuf_vsm(vec3 rco, sampler2D shadowmap, mat4 shadowpersmat, float } } +void shadows_only(vec3 rco, sampler2DShadow shadowmap, mat4 shadowpersmat, float shadowbias, vec3 shadowcolor, float inp, out vec3 result) +{ + result = vec3(1.0); + + if(inp > 0.0) { + float shadfac; + + test_shadowbuf(rco, shadowmap, shadowpersmat, shadowbias, inp, shadfac); + result -= (1.0 - shadfac) * (vec3(1.0) - shadowcolor); + } +} + +void shadows_only_vsm(vec3 rco, sampler2D shadowmap, mat4 shadowpersmat, float shadowbias, float bleedbias, vec3 shadowcolor, float inp, out vec3 result) +{ + result = vec3(1.0); + + if(inp > 0.0) { + float shadfac; + + test_shadowbuf_vsm(rco, shadowmap, shadowpersmat, shadowbias, bleedbias, inp, shadfac); + result -= (1.0 - shadfac) * (vec3(1.0) - shadowcolor); + } +} + void shade_light_texture(vec3 rco, sampler2D cookie, mat4 shadowpersmat, out vec4 result) { @@ -2144,6 +2192,24 @@ void node_fresnel(float ior, vec3 N, vec3 I, out float result) result = fresnel_dielectric(normalize(I), N, (gl_FrontFacing)? eta: 1.0/eta); } +/* layer_weight */ + +void node_layer_weight(float blend, vec3 N, vec3 I, out float fresnel, out float facing) +{ + /* fresnel */ + float eta = max(1.0 - blend, 0.00001); + fresnel = fresnel_dielectric(normalize(I), N, (gl_FrontFacing)? 1.0/eta : eta ); + + /* facing */ + facing = abs(dot(normalize(I), N)); + if(blend != 0.5) { + blend = clamp(blend, 0.0, 0.99999); + blend = (blend < 0.5)? 2.0*blend: 0.5/(1.0 - blend); + facing = pow(facing, blend); + } + facing = 1.0 - facing; +} + /* gamma */ void node_gamma(vec4 col, float gamma, out vec4 outcol) |