archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup to previous commit, we can reuse set_rgb instead of new function

Browse Source
This commit is contained in:
Antonis Ryakiotakis
2014-10-07 11:12:00 +02:00
parent 14c57b6c78
commit d7a1b09f85
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpu/intern/gpu_material.c
View File

@@ -739,7 +739,7 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
i = is;
GPU_link(mat, "shade_visifac", i, visifac, shi->refl, &i);
GPU_link(mat, "set_value_v3", GPU_dynamic_uniform(lamp->dyncol, GPU_DYNAMIC_LAMP_DYNCOL, lamp->ob), &lcol);
GPU_link(mat, "set_rgb", GPU_dynamic_uniform(lamp->dyncol, GPU_DYNAMIC_LAMP_DYNCOL, lamp->ob), &lcol);
shade_light_textures(mat, lamp, &lcol);
GPU_link(mat, "shade_mul_value_v3", GPU_dynamic_uniform(&lamp->dynenergy, GPU_DYNAMIC_LAMP_DYNENERGY, lamp->ob), lcol, &lcol);

5
source/blender/gpu/shaders/gpu_shader_material.glsl
View File

@@ -385,11 +385,6 @@ void set_value(float val, out float outval)
outval = val;
}
void set_value_v3(vec3 val, out vec3 outval)
{
outval = val;
}
void set_rgb(vec3 col, out vec3 outcol)
{
outcol = col;