Blender Git Loki
Git Commits -> Revision 42beba3
Revision 42beba3 by Jason Wilkins (soc-2014-viewport_fx) June 27, 2014, 10:20 (GMT) |
(Showing My Work) Expanded GPU Module to Support Modern OpenGL I am updating the GPU module so that it contains code needed for Blender to support a programmable shader based pipeline. In an effort to make sure things always compile I've excluded most of the changes from 2013 that were made to gpu_codegen, gpu_draw, gpu_extensions, and gpu_material. This new functionality is not used anywhere in Blender yet. That will come gradually. This is a bit rough because I wanted something in the repository before evaluations. I wanted to break this into smaller more manageable pieces for code review, but that would take too much time. However, this might still work for review purposes. |
Commit Details:
Full Hash: 42beba3f739663857be068975f67149ef4d53d8c
Parent Commit: 4f88d6d
Lines Changed: +26714, -1111
78 Added Paths:
/source/blender/gpu/GPU_aspect.h (+73, -0) (View)
/source/blender/gpu/GPU_basic.h (+70, -0) (View)
/source/blender/gpu/GPU_blender_aspect.h (+55, -0) (View)
/source/blender/gpu/GPU_clipping.h (+57, -0) (View)
/source/blender/gpu/GPU_colors.h (+46, -0) (View)
/source/blender/gpu/GPU_common.h (+84, -0) (View)
/source/blender/gpu/GPU_deprecated.h (+650, -0) (View)
/source/blender/gpu/GPU_font.h (+56, -0) (View)
/source/blender/gpu/GPU_immediate.h (+976, -0) (View)
/source/blender/gpu/GPU_init_exit.h (+46, -0) (View)
/source/blender/gpu/GPU_lighting.h (+77, -0) (View)
/source/blender/gpu/GPU_matrix.h (+107, -0) (View)
/source/blender/gpu/GPU_pixels.h (+119, -0) (View)
/source/blender/gpu/GPU_primitives.h (+234, -0) (View)
/source/blender/gpu/GPU_raster.h (+103, -0) (View)
/source/blender/gpu/GPU_safety.h (+108, -0) (View)
/source/blender/gpu/GPU_select.h (+61, -0) (View)
/source/blender/gpu/GPU_sprite.h (+65, -0) (View)
/source/blender/gpu/GPU_state_latch.h (+81, -0) (View)
/source/blender/gpu/GPU_utility.h (+75, -0) (View)
/source/blender/gpu/intern/gpu_aspect.c (+248, -0) (View)
/source/blender/gpu/intern/gpu_aspect_intern.h (+54, -0) (View)
/source/blender/gpu/intern/gpu_basic.c (+330, -0) (View)
/source/blender/gpu/intern/gpu_basic_intern.h (+56, -0) (View)
/source/blender/gpu/intern/gpu_blender_aspect.c (+262, -0) (View)
/source/blender/gpu/intern/gpu_blender_aspect_intern.h (+48, -0) (View)
/source/blender/gpu/intern/gpu_buffers - Copy.c (+2756, -0) (View)
/source/blender/gpu/intern/gpu_clipping.c (+150, -0) (View)
/source/blender/gpu/intern/gpu_clipping_intern.h (+56, -0) (View)
/source/blender/gpu/intern/gpu_common.c (+503, -0) (View)
/source/blender/gpu/intern/gpu_common_intern.h (+142, -0) (View)
/source/blender/gpu/intern/gpu_debug.c (+428, -0) (View)
/source/blender/gpu/intern/gpu_draw - Copy.c (+2201, -0) (View)
/source/blender/gpu/intern/gpu_extensions - Copy.c (+2266, -0) (View)
/source/blender/gpu/intern/gpu_extensions_intern.h (+305, -0) (View)
/source/blender/gpu/intern/gpu_font.c (+210, -0) (View)
/source/blender/gpu/intern/gpu_font_intern.h (+51, -0) (View)
/source/blender/gpu/intern/gpu_immediate.c (+1665, -0) (View)
/source/blender/gpu/intern/gpu_immediate_gl.c (+729, -0) (View)
/source/blender/gpu/intern/gpu_immediate_intern.h (+48, -0) (View)
/source/blender/gpu/intern/gpu_init_exit.c (+142, -0) (View)
/source/blender/gpu/intern/gpu_lighting.c (+252, -0) (View)
/source/blender/gpu/intern/gpu_lighting_intern.h (+53, -0) (View)
/source/blender/gpu/intern/gpu_matrix.c (+550, -0) (View)
/source/blender/gpu/intern/gpu_matrix_intern.h (+52, -0) (View)
/source/blender/gpu/intern/gpu_pixels.c (+636, -0) (View)
/source/blender/gpu/intern/gpu_pixels_intern.h (+51, -0) (View)
/source/blender/gpu/intern/gpu_primitives.c (+1328, -0) (View)
/source/blender/gpu/intern/gpu_primitives_inline.h (+244, -0) (View)
/source/blender/gpu/intern/gpu_profile.h (+53, -0) (View)
/source/blender/gpu/intern/gpu_raster.c (+691, -0) (View)
/source/blender/gpu/intern/gpu_raster_intern.h (+58, -0) (View)
/source/blender/gpu/intern/gpu_safety.c (+76, -0) (View)
/source/blender/gpu/intern/gpu_select.c (+191, -0) (View)
/source/blender/gpu/intern/gpu_select_intern.h (+61, -0) (View)
/source/blender/gpu/intern/gpu_sprite.c (+350, -0) (View)
/source/blender/gpu/intern/gpu_sprite_intern.h (+56, -0) (View)
/source/blender/gpu/intern/gpu_state_latch.c (+235, -0) (View)
/source/blender/gpu/intern/gpu_state_latch_intern.h (+48, -0) (View)
/source/blender/gpu/intern/gpu_utility.c (+124, -0) (View)
/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl (+181, -0) (View)
/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl (+64, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_attribs.glsl (+55, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_constants.glsl (+17, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_uniforms.glsl (+63, -0) (View)
/source/blender/gpu/shaders/gpu_shader_font_frag.glsl (+11, -0) (View)
/source/blender/gpu/shaders/gpu_shader_font_vert.glsl (+10, -0) (View)
/source/blender/gpu/shaders/gpu_shader_material - Copy.glsl (+2460, -0) (View)
/source/blender/gpu/shaders/gpu_shader_pixels_frag.glsl (+6, -0) (View)
/source/blender/gpu/shaders/gpu_shader_pixels_uniforms.glsl (+12, -0) (View)
/source/blender/gpu/shaders/gpu_shader_pixels_vert.glsl (+9, -0) (View)
/source/blender/gpu/shaders/gpu_shader_raster_frag.glsl (+10, -0) (View)
/source/blender/gpu/shaders/gpu_shader_raster_uniforms.glsl (+3, -0) (View)
/source/blender/gpu/shaders/gpu_shader_raster_vert.glsl (+17, -0) (View)
/source/blender/gpu/shaders/gpu_shader_vertex - Copy.glsl (+18, -0) (View)
/source/blender/windowmanager/intern/wm_init_exit.c.0 (+539, -0) (View)
/source/blender/windowmanager/intern/wm_init_exit.c.orig (+557, -0) (View)
/source/blender/windowmanager/intern/wm_window.c.0 (+1507, -0) (View)
/source/blender/gpu/GPU_basic.h (+70, -0) (View)
/source/blender/gpu/GPU_blender_aspect.h (+55, -0) (View)
/source/blender/gpu/GPU_clipping.h (+57, -0) (View)
/source/blender/gpu/GPU_colors.h (+46, -0) (View)
/source/blender/gpu/GPU_common.h (+84, -0) (View)
/source/blender/gpu/GPU_deprecated.h (+650, -0) (View)
/source/blender/gpu/GPU_font.h (+56, -0) (View)
/source/blender/gpu/GPU_immediate.h (+976, -0) (View)
/source/blender/gpu/GPU_init_exit.h (+46, -0) (View)
/source/blender/gpu/GPU_lighting.h (+77, -0) (View)
/source/blender/gpu/GPU_matrix.h (+107, -0) (View)
/source/blender/gpu/GPU_pixels.h (+119, -0) (View)
/source/blender/gpu/GPU_primitives.h (+234, -0) (View)
/source/blender/gpu/GPU_raster.h (+103, -0) (View)
/source/blender/gpu/GPU_safety.h (+108, -0) (View)
/source/blender/gpu/GPU_select.h (+61, -0) (View)
/source/blender/gpu/GPU_sprite.h (+65, -0) (View)
/source/blender/gpu/GPU_state_latch.h (+81, -0) (View)
/source/blender/gpu/GPU_utility.h (+75, -0) (View)
/source/blender/gpu/intern/gpu_aspect.c (+248, -0) (View)
/source/blender/gpu/intern/gpu_aspect_intern.h (+54, -0) (View)
/source/blender/gpu/intern/gpu_basic.c (+330, -0) (View)
/source/blender/gpu/intern/gpu_basic_intern.h (+56, -0) (View)
/source/blender/gpu/intern/gpu_blender_aspect.c (+262, -0) (View)
/source/blender/gpu/intern/gpu_blender_aspect_intern.h (+48, -0) (View)
/source/blender/gpu/intern/gpu_buffers - Copy.c (+2756, -0) (View)
/source/blender/gpu/intern/gpu_clipping.c (+150, -0) (View)
/source/blender/gpu/intern/gpu_clipping_intern.h (+56, -0) (View)
/source/blender/gpu/intern/gpu_common.c (+503, -0) (View)
/source/blender/gpu/intern/gpu_common_intern.h (+142, -0) (View)
/source/blender/gpu/intern/gpu_debug.c (+428, -0) (View)
/source/blender/gpu/intern/gpu_draw - Copy.c (+2201, -0) (View)
/source/blender/gpu/intern/gpu_extensions - Copy.c (+2266, -0) (View)
/source/blender/gpu/intern/gpu_extensions_intern.h (+305, -0) (View)
/source/blender/gpu/intern/gpu_font.c (+210, -0) (View)
/source/blender/gpu/intern/gpu_font_intern.h (+51, -0) (View)
/source/blender/gpu/intern/gpu_immediate.c (+1665, -0) (View)
/source/blender/gpu/intern/gpu_immediate_gl.c (+729, -0) (View)
/source/blender/gpu/intern/gpu_immediate_intern.h (+48, -0) (View)
/source/blender/gpu/intern/gpu_init_exit.c (+142, -0) (View)
/source/blender/gpu/intern/gpu_lighting.c (+252, -0) (View)
/source/blender/gpu/intern/gpu_lighting_intern.h (+53, -0) (View)
/source/blender/gpu/intern/gpu_matrix.c (+550, -0) (View)
/source/blender/gpu/intern/gpu_matrix_intern.h (+52, -0) (View)
/source/blender/gpu/intern/gpu_pixels.c (+636, -0) (View)
/source/blender/gpu/intern/gpu_pixels_intern.h (+51, -0) (View)
/source/blender/gpu/intern/gpu_primitives.c (+1328, -0) (View)
/source/blender/gpu/intern/gpu_primitives_inline.h (+244, -0) (View)
/source/blender/gpu/intern/gpu_profile.h (+53, -0) (View)
/source/blender/gpu/intern/gpu_raster.c (+691, -0) (View)
/source/blender/gpu/intern/gpu_raster_intern.h (+58, -0) (View)
/source/blender/gpu/intern/gpu_safety.c (+76, -0) (View)
/source/blender/gpu/intern/gpu_select.c (+191, -0) (View)
/source/blender/gpu/intern/gpu_select_intern.h (+61, -0) (View)
/source/blender/gpu/intern/gpu_sprite.c (+350, -0) (View)
/source/blender/gpu/intern/gpu_sprite_intern.h (+56, -0) (View)
/source/blender/gpu/intern/gpu_state_latch.c (+235, -0) (View)
/source/blender/gpu/intern/gpu_state_latch_intern.h (+48, -0) (View)
/source/blender/gpu/intern/gpu_utility.c (+124, -0) (View)
/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl (+181, -0) (View)
/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl (+64, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_attribs.glsl (+55, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_constants.glsl (+17, -0) (View)
/source/blender/gpu/shaders/gpu_shader_common_uniforms.glsl (+63, -0) (View)
/source/blender/gpu/shaders/gpu_shader_font_frag.glsl (+11, -0) (View)
/source/blender/gpu/shaders/gpu_shader_font_vert.glsl (+10, -0) (View)
/source/blender/gpu/shaders/gpu_shader_material - Copy.glsl (+2460, -0) (View)
/source/blender/gpu/shaders/gpu_shader_pixels_frag.glsl (+6, -0) (View)
/source/blender/gpu/shaders/gpu_shader_pixels_uniforms.glsl (+12, -0) (View)
/source/blender/gpu/shaders/gpu_shader_pixels_vert.glsl (+9, -0) (View)
/source/blender/gpu/shaders/gpu_shader_raster_frag.glsl (+10, -0) (View)
/source/blender/gpu/shaders/gpu_shader_raster_uniforms.glsl (+3, -0) (View)
/source/blender/gpu/shaders/gpu_shader_raster_vert.glsl (+17, -0) (View)
/source/blender/gpu/shaders/gpu_shader_vertex - Copy.glsl (+18, -0) (View)
/source/blender/windowmanager/intern/wm_init_exit.c.0 (+539, -0) (View)
/source/blender/windowmanager/intern/wm_init_exit.c.orig (+557, -0) (View)
/source/blender/windowmanager/intern/wm_window.c.0 (+1507, -0) (View)
4 Deleted Paths:
/source/blender/gpu/GPU_simple_shader.h (+0, -89)
/source/blender/gpu/intern/gpu_simple_shader.c (+0, -282)
/source/blender/gpu/shaders/gpu_shader_simple_frag.glsl (+0, -169)
/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl (+0, -46)
/source/blender/gpu/intern/gpu_simple_shader.c (+0, -282)
/source/blender/gpu/shaders/gpu_shader_simple_frag.glsl (+0, -169)
/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl (+0, -46)
14 Modified Paths:
/source/blender/gpu/CMakeLists.txt (+105, -13) (Diff)
/source/blender/gpu/GPU_buffers.h (+16, -11) (Diff)
/source/blender/gpu/GPU_draw.h (+18, -6) (Diff)
/source/blender/gpu/GPU_extensions.h (+16, -9) (Diff)
/source/blender/gpu/GPU_glew.h (+3, -3) (Diff)
/source/blender/gpu/GPU_material.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+23, -15) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+13, -19) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+0, -388) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+33, -16) (Diff)
/source/blender/gpu/intern/gpu_material.c (+20, -21) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+5, -6) (Diff)
/source/blender/windowmanager/intern/wm_window.c (+16, -16) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+3, -2) (Diff)
/source/blender/gpu/GPU_buffers.h (+16, -11) (Diff)
/source/blender/gpu/GPU_draw.h (+18, -6) (Diff)
/source/blender/gpu/GPU_extensions.h (+16, -9) (Diff)
/source/blender/gpu/GPU_glew.h (+3, -3) (Diff)
/source/blender/gpu/GPU_material.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+23, -15) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+13, -19) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+0, -388) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+33, -16) (Diff)
/source/blender/gpu/intern/gpu_material.c (+20, -21) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+5, -6) (Diff)
/source/blender/windowmanager/intern/wm_window.c (+16, -16) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+3, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021