Blender Git Loki
Git Commits -> Revision c89ced4
Revision c89ced4 by turjuque (pbr-viewport) January 6, 2016, 20:38 (GMT) |
PRB viewport : Adding lamp support and post effects. and lots of gpu stuff. No more leaks. |
Commit Details:
Full Hash: c89ced47bb887567e0aae9ce6dc6162254867756
Parent Commit: 4aebb28
Lines Changed: +2179, -360
1 Added Path:
/source/blender/gpu/shaders/gpu_shader_fx_colormanage_frag.glsl (+118, -0) (View)
48 Modified Paths:
/.gitignore (+2, -0) (Diff)
/release/datafiles/splash.png (+0, -0) (Diff)
/release/datafiles/splash_2x.png (+0, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+2, -0) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+3, -3) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+13, -5) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+26, -9) (Diff)
/source/blender/gpu/CMakeLists.txt (+2, -0) (Diff)
/source/blender/gpu/GPU_compositing.h (+5, -2) (Diff)
/source/blender/gpu/GPU_draw.h (+2, -2) (Diff)
/source/blender/gpu/GPU_extensions.h (+1, -1) (Diff)
/source/blender/gpu/GPU_material.h (+56, -13) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+4, -2) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_compositing.c (+152, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+18, -12) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+12, -3) (Diff)
/source/blender/gpu/intern/gpu_material.c (+447, -56) (Diff)
/source/blender/gpu/SConscript (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+940, -97) (Diff)
/source/blender/makesdna/DNA_color_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_gpu_types.h (+3, -2) (Diff)
/source/blender/makesdna/DNA_image_types.h (+2, -1) (Diff)
/source/blender/makesrna/intern/rna_color.c (+8, -2) (Diff)
/source/blender/makesrna/intern/rna_image_api.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+19, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_blackbody.c (+6, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c (+33, -47) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c (+55, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c (+33, -58) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c (+46, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c (+45, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c (+30, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_emission.c (+8, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_fresnel.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_geometry.c (+12, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_lamp.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_light_falloff.c (+10, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_lamp.c (+11, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_texture.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_coord.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_environment.c (+21, -16) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_image.c (+5, -3) (Diff)
/source/blender/nodes/shader/nodes/node_shader_wavelength.c (+7, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp (+1, -1) (Diff)
/release/datafiles/splash.png (+0, -0) (Diff)
/release/datafiles/splash_2x.png (+0, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+2, -0) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+3, -3) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+13, -5) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+26, -9) (Diff)
/source/blender/gpu/CMakeLists.txt (+2, -0) (Diff)
/source/blender/gpu/GPU_compositing.h (+5, -2) (Diff)
/source/blender/gpu/GPU_draw.h (+2, -2) (Diff)
/source/blender/gpu/GPU_extensions.h (+1, -1) (Diff)
/source/blender/gpu/GPU_material.h (+56, -13) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+4, -2) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_compositing.c (+152, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+18, -12) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+12, -3) (Diff)
/source/blender/gpu/intern/gpu_material.c (+447, -56) (Diff)
/source/blender/gpu/SConscript (+1, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+940, -97) (Diff)
/source/blender/makesdna/DNA_color_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_gpu_types.h (+3, -2) (Diff)
/source/blender/makesdna/DNA_image_types.h (+2, -1) (Diff)
/source/blender/makesrna/intern/rna_color.c (+8, -2) (Diff)
/source/blender/makesrna/intern/rna_image_api.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+6, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+19, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_blackbody.c (+6, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c (+33, -47) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c (+55, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c (+33, -58) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c (+46, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c (+45, -4) (Diff)
/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c (+30, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_emission.c (+8, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_fresnel.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_geometry.c (+12, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_lamp.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_light_falloff.c (+10, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_output_lamp.c (+11, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_texture.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_coord.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_environment.c (+21, -16) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_image.c (+5, -3) (Diff)
/source/blender/nodes/shader/nodes/node_shader_wavelength.c (+7, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp (+1, -1) (Diff)