Blender Git Loki
Git Commits -> Revision 4ca1fc4
August 4, 2013, 10:04 (GMT) |
Committing since GPU module compiles again. I've made too many changes without being able to compile and test. Concentrating now on bringing things back into a testable state. |
Commit Details:
Full Hash: 4ca1fc427f8203458dfdb2449dc01c1230a419a9
SVN Revision: 58899
Parent Commit: c54932e
Lines Changed: +3946, -5908
13 Added Paths:
/source/blender/gpu/GPU_basic_shader.h (+78, -0) (View)
/source/blender/gpu/GPU_font_shader.h (+54, -0) (View)
/source/blender/gpu/intern/gpu_basic_shader.c (+279, -0) (View)
/source/blender/gpu/intern/gpu_common.c (+394, -0) (View)
/source/blender/gpu/intern/gpu_common.h (+157, -0) (View)
/source/blender/gpu/intern/gpu_font_shader.c (+134, -0) (View)
/source/blender/gpu/intern/gpu_immediate_gl.c (+660, -0) (View)
/source/blender/gpu/intern/gpu_immediate_gl.h (+69, -0) (View)
/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl (+169, -0) (View)
/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl (+45, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_attribs.glsl (+18, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_constants.glsl (+17, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_uniforms.glsl (+44, -0) (View)
/source/blender/gpu/GPU_font_shader.h (+54, -0) (View)
/source/blender/gpu/intern/gpu_basic_shader.c (+279, -0) (View)
/source/blender/gpu/intern/gpu_common.c (+394, -0) (View)
/source/blender/gpu/intern/gpu_common.h (+157, -0) (View)
/source/blender/gpu/intern/gpu_font_shader.c (+134, -0) (View)
/source/blender/gpu/intern/gpu_immediate_gl.c (+660, -0) (View)
/source/blender/gpu/intern/gpu_immediate_gl.h (+69, -0) (View)
/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl (+169, -0) (View)
/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl (+45, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_attribs.glsl (+18, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_constants.glsl (+17, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_uniforms.glsl (+44, -0) (View)
22 Deleted Paths:
/source/blender/gpu/GPU_simple_shader.h (+0, -86)
/source/blender/gpu/intern/gpu_immediate_gl11.c (+0, -444)
/source/blender/gpu/intern/gpu_immediate_glsl.c (+0, -595)
/source/blender/gpu/intern/gpu_immediate_internal.h (+0, -207)
/source/blender/gpu/intern/gpu_immediate_vbo.c (+0, -69)
/source/blender/gpu/intern/gpu_known.c (+0, -118)
/source/blender/gpu/intern/gpu_known.h (+0, -105)
/source/blender/gpu/intern/gpu_lighting_gl11.c (+0, -149)
/source/blender/gpu/intern/gpu_lighting_glsl.c (+0, -136)
/source/blender/gpu/intern/gpu_lighting_inline.h (+0, -219)
/source/blender/gpu/intern/gpu_lighting_internal.h (+0, -88)
/source/blender/gpu/intern/gpu_object.c (+0, -37)
/source/blender/gpu/intern/gpu_object_gl11.c (+0, -105)
/source/blender/gpu/intern/gpu_object_gl11.h (+0, -53)
/source/blender/gpu/intern/gpu_object_gles.c (+0, -537)
/source/blender/gpu/intern/gpu_object_gles.h (+0, -100)
/source/blender/gpu/intern/gpu_simple_shader.c (+0, -432)
/source/blender/gpu/shaders/gpu_shader_known_attribs.glsl (+0, -18)
/source/blender/gpu/shaders/gpu_shader_known_constants.glsl (+0, -17)
/source/blender/gpu/shaders/gpu_shader_known_uniforms.glsl (+0, -44)
/source/blender/gpu/shaders/gpu_shader_simple_frag.glsl (+0, -169)
/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl (+0, -45)
/source/blender/gpu/intern/gpu_immediate_gl11.c (+0, -444)
/source/blender/gpu/intern/gpu_immediate_glsl.c (+0, -595)
/source/blender/gpu/intern/gpu_immediate_internal.h (+0, -207)
/source/blender/gpu/intern/gpu_immediate_vbo.c (+0, -69)
/source/blender/gpu/intern/gpu_known.c (+0, -118)
/source/blender/gpu/intern/gpu_known.h (+0, -105)
/source/blender/gpu/intern/gpu_lighting_gl11.c (+0, -149)
/source/blender/gpu/intern/gpu_lighting_glsl.c (+0, -136)
/source/blender/gpu/intern/gpu_lighting_inline.h (+0, -219)
/source/blender/gpu/intern/gpu_lighting_internal.h (+0, -88)
/source/blender/gpu/intern/gpu_object.c (+0, -37)
/source/blender/gpu/intern/gpu_object_gl11.c (+0, -105)
/source/blender/gpu/intern/gpu_object_gl11.h (+0, -53)
/source/blender/gpu/intern/gpu_object_gles.c (+0, -537)
/source/blender/gpu/intern/gpu_object_gles.h (+0, -100)
/source/blender/gpu/intern/gpu_simple_shader.c (+0, -432)
/source/blender/gpu/shaders/gpu_shader_known_attribs.glsl (+0, -18)
/source/blender/gpu/shaders/gpu_shader_known_constants.glsl (+0, -17)
/source/blender/gpu/shaders/gpu_shader_known_uniforms.glsl (+0, -44)
/source/blender/gpu/shaders/gpu_shader_simple_frag.glsl (+0, -169)
/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl (+0, -45)
101 Modified Paths:
/source/blender/blenfont/intern/blf.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+16, -13) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+17, -17) (Diff)
/source/blender/blenlib/BLI_utildefines.h (+18, -3) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+8, -8) (Diff)
/source/blender/editors/animation/anim_draw.c (+1, -1) (Diff)
/source/blender/editors/animation/anim_markers.c (+2, -2) (Diff)
/source/blender/editors/animation/keyframes_draw.c (+8, -8) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+9, -9) (Diff)
/source/blender/editors/armature/reeb.c (+7, -7) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+4, -4) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+1, -1) (Diff)
/source/blender/editors/include/UI_resources.h (+0, -5) (Diff)
/source/blender/editors/interface/interface.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_draw.c (+62, -62) (Diff)
/source/blender/editors/interface/interface_icons.c (+21, -21) (Diff)
/source/blender/editors/interface/interface_panel.c (+6, -6) (Diff)
/source/blender/editors/interface/interface_regions.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_widgets.c (+31, -31) (Diff)
/source/blender/editors/interface/resources.c (+5, -71) (Diff)
/source/blender/editors/interface/view2d.c (+11, -11) (Diff)
/source/blender/editors/mask/mask_draw.c (+15, -15) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+6, -6) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+1, -1) (Diff)
/source/blender/editors/physics/particle_edit.c (+1, -1) (Diff)
/source/blender/editors/render/render_internal.c (+2, -2) (Diff)
/source/blender/editors/screen/area.c (+21, -21) (Diff)
/source/blender/editors/screen/glutil.c (+7, -7) (Diff)
/source/blender/editors/screen/screendump.c (+2, -2) (Diff)
/source/blender/editors/screen/screen_edit.c (+7, -7) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+7, -7) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+2, -2) (Diff)
/source/blender/editors/space_action/action_draw.c (+17, -17) (Diff)
/source/blender/editors/space_clip/clip_dopesheet_draw.c (+6, -6) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+22, -22) (Diff)
/source/blender/editors/space_clip/clip_graph_draw.c (+2, -2) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+1, -1) (Diff)
/source/blender/editors/space_console/console_draw.c (+1, -1) (Diff)
/source/blender/editors/space_file/file_draw.c (+5, -5) (Diff)
/source/blender/editors/space_graph/graph_draw.c (+7, -7) (Diff)
/source/blender/editors/space_image/image_draw.c (+14, -14) (Diff)
/source/blender/editors/space_info/textview.c (+10, -10) (Diff)
/source/blender/editors/space_nla/nla_draw.c (+14, -14) (Diff)
/source/blender/editors/space_node/drawnode.c (+9, -9) (Diff)
/source/blender/editors/space_node/node_draw.c (+11, -11) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+9, -9) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+31, -31) (Diff)
/source/blender/editors/space_text/text_draw.c (+2, -2) (Diff)
/source/blender/editors/space_time/space_time.c (+5, -5) (Diff)
/source/blender/editors/space_view3d/drawanimviz.c (+4, -4) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+87, -72) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+72, -49) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+122, -106) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+15, -15) (Diff)
/source/blender/editors/space_view3d/view3d_fly.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_ruler.c (+11, -11) (Diff)
/source/blender/editors/transform/transform.c (+11, -11) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+1, -1) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+18, -18) (Diff)
/source/blender/gpu/CMakeLists.txt (+20, -26) (Diff)
/source/blender/gpu/GPU_buffers.h (+20, -16) (Diff)
/source/blender/gpu/GPU_compatibility.h (+0, -1) (Diff)
/source/blender/gpu/GPU_draw.h (+2, -9) (Diff)
/source/blender/gpu/GPU_material.h (+2, -0) (Diff)
/source/blender/gpu/GPU_matrix.h (+2, -2) (Diff)
/source/blender/gpu/GPU_object.h (+5, -5) (Diff)
/source/blender/gpu/intern/gpu_aspect.c (+61, -20) (Diff)
/source/blender/gpu/intern/gpu_aspect.h (+23, -16) (Diff)
/source/blender/gpu/intern/gpu_aspectfuncs.c (+39, -112) (Diff)
/source/blender/gpu/intern/gpu_aspectfuncs.h (+6, -10) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+6, -3) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+19, -34) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+9, -18) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+131, -129) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+23, -16) (Diff)
/source/blender/gpu/intern/gpu_extension_wrapper.c (+22, -0) (Diff)
/source/blender/gpu/intern/gpu_extension_wrapper.h (+4, -0) (Diff)
/source/blender/gpu/intern/gpu_glew.h (+4, -0) (Diff)
/source/blender/gpu/intern/gpu_immediate.c (+216, -403) (Diff)
/source/blender/gpu/intern/gpu_immediate.h (+65, -111) (Diff)
/source/blender/gpu/intern/gpu_immediate_inline.h (+68, -148) (Diff)
/source/blender/gpu/intern/gpu_lighting.c (+124, -91) (Diff)
/source/blender/gpu/intern/gpu_lighting.h (+16, -60) (Diff)
/source/blender/gpu/intern/gpu_material.c (+13, -10) (Diff)
/source/blender/gpu/intern/gpu_matrix.c (+26, -29) (Diff)
/source/blender/gpu/intern/gpu_pixels.c (+14, -9) (Diff)
/source/blender/gpu/intern/gpu_raster.c (+22, -1) (Diff)
/source/blender/gpu/intern/gpu_raster.h (+4, -0) (Diff)
/source/blender/gpu/intern/gpu_select.c (+1, -0) (Diff)
/source/blender/windowmanager/intern/wm_dragdrop.c (+6, -6) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+3, -3) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_gesture.c (+13, -13) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+11, -7) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+4, -4) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_subwindow.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+16, -13) (Diff)
/source/blender/blenkernel/intern/editderivedmesh.c (+4, -4) (Diff)
/source/blender/blenkernel/intern/pbvh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+17, -17) (Diff)
/source/blender/blenlib/BLI_utildefines.h (+18, -3) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+8, -8) (Diff)
/source/blender/editors/animation/anim_draw.c (+1, -1) (Diff)
/source/blender/editors/animation/anim_markers.c (+2, -2) (Diff)
/source/blender/editors/animation/keyframes_draw.c (+8, -8) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+9, -9) (Diff)
/source/blender/editors/armature/reeb.c (+7, -7) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+4, -4) (Diff)
/source/blender/editors/gpencil/gpencil_paint.c (+1, -1) (Diff)
/source/blender/editors/include/UI_resources.h (+0, -5) (Diff)
/source/blender/editors/interface/interface.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_draw.c (+62, -62) (Diff)
/source/blender/editors/interface/interface_icons.c (+21, -21) (Diff)
/source/blender/editors/interface/interface_panel.c (+6, -6) (Diff)
/source/blender/editors/interface/interface_regions.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_widgets.c (+31, -31) (Diff)
/source/blender/editors/interface/resources.c (+5, -71) (Diff)
/source/blender/editors/interface/view2d.c (+11, -11) (Diff)
/source/blender/editors/mask/mask_draw.c (+15, -15) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+6, -6) (Diff)
/source/blender/editors/mesh/editmesh_loopcut.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+1, -1) (Diff)
/source/blender/editors/physics/particle_edit.c (+1, -1) (Diff)
/source/blender/editors/render/render_internal.c (+2, -2) (Diff)
/source/blender/editors/screen/area.c (+21, -21) (Diff)
/source/blender/editors/screen/glutil.c (+7, -7) (Diff)
/source/blender/editors/screen/screendump.c (+2, -2) (Diff)
/source/blender/editors/screen/screen_edit.c (+7, -7) (Diff)
/source/blender/editors/sculpt_paint/paint_cursor.c (+7, -7) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+2, -2) (Diff)
/source/blender/editors/space_action/action_draw.c (+17, -17) (Diff)
/source/blender/editors/space_clip/clip_dopesheet_draw.c (+6, -6) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+22, -22) (Diff)
/source/blender/editors/space_clip/clip_graph_draw.c (+2, -2) (Diff)
/source/blender/editors/space_clip/clip_utils.c (+1, -1) (Diff)
/source/blender/editors/space_console/console_draw.c (+1, -1) (Diff)
/source/blender/editors/space_file/file_draw.c (+5, -5) (Diff)
/source/blender/editors/space_graph/graph_draw.c (+7, -7) (Diff)
/source/blender/editors/space_image/image_draw.c (+14, -14) (Diff)
/source/blender/editors/space_info/textview.c (+10, -10) (Diff)
/source/blender/editors/space_nla/nla_draw.c (+14, -14) (Diff)
/source/blender/editors/space_node/drawnode.c (+9, -9) (Diff)
/source/blender/editors/space_node/node_draw.c (+11, -11) (Diff)
/source/blender/editors/space_outliner/outliner_draw.c (+9, -9) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+31, -31) (Diff)
/source/blender/editors/space_text/text_draw.c (+2, -2) (Diff)
/source/blender/editors/space_time/space_time.c (+5, -5) (Diff)
/source/blender/editors/space_view3d/drawanimviz.c (+4, -4) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+87, -72) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+72, -49) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+122, -106) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+15, -15) (Diff)
/source/blender/editors/space_view3d/view3d_fly.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_ruler.c (+11, -11) (Diff)
/source/blender/editors/transform/transform.c (+11, -11) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+1, -1) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+18, -18) (Diff)
/source/blender/gpu/CMakeLists.txt (+20, -26) (Diff)
/source/blender/gpu/GPU_buffers.h (+20, -16) (Diff)
/source/blender/gpu/GPU_compatibility.h (+0, -1) (Diff)
/source/blender/gpu/GPU_draw.h (+2, -9) (Diff)
/source/blender/gpu/GPU_material.h (+2, -0) (Diff)
/source/blender/gpu/GPU_matrix.h (+2, -2) (Diff)
/source/blender/gpu/GPU_object.h (+5, -5) (Diff)
/source/blender/gpu/intern/gpu_aspect.c (+61, -20) (Diff)
/source/blender/gpu/intern/gpu_aspect.h (+23, -16) (Diff)
/source/blender/gpu/intern/gpu_aspectfuncs.c (+39, -112) (Diff)
/source/blender/gpu/intern/gpu_aspectfuncs.h (+6, -10) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+6, -3) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+19, -34) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+9, -18) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+131, -129) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+23, -16) (Diff)
/source/blender/gpu/intern/gpu_extension_wrapper.c (+22, -0) (Diff)
/source/blender/gpu/intern/gpu_extension_wrapper.h (+4, -0) (Diff)
/source/blender/gpu/intern/gpu_glew.h (+4, -0) (Diff)
/source/blender/gpu/intern/gpu_immediate.c (+216, -403) (Diff)
/source/blender/gpu/intern/gpu_immediate.h (+65, -111) (Diff)
/source/blender/gpu/intern/gpu_immediate_inline.h (+68, -148) (Diff)
/source/blender/gpu/intern/gpu_lighting.c (+124, -91) (Diff)
/source/blender/gpu/intern/gpu_lighting.h (+16, -60) (Diff)
/source/blender/gpu/intern/gpu_material.c (+13, -10) (Diff)
/source/blender/gpu/intern/gpu_matrix.c (+26, -29) (Diff)
/source/blender/gpu/intern/gpu_pixels.c (+14, -9) (Diff)
/source/blender/gpu/intern/gpu_raster.c (+22, -1) (Diff)
/source/blender/gpu/intern/gpu_raster.h (+4, -0) (Diff)
/source/blender/gpu/intern/gpu_select.c (+1, -0) (Diff)
/source/blender/windowmanager/intern/wm_dragdrop.c (+6, -6) (Diff)
/source/blender/windowmanager/intern/wm_draw.c (+3, -3) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_gesture.c (+13, -13) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+11, -7) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+4, -4) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_subwindow.c (+2, -2) (Diff)