Blender Git Loki
Git Commits -> Revision 7a60f88
Revision 7a60f88 by Mike Erwin (master) October 10, 2016, 03:03 (GMT) |
OpenGL: plug new matrix system into shaders (WIP) Built-in shaders now use uniforms instead of legacy built-in matrices. So far I only hooked this up for new immediate mode. We use the same matrix naming convention as OpenGL, but without the gl_ prefix, e.g. gl_ModelView becomes ModelView. Right now it can skip the new matrix stack and use the legacy built-in matrices app-side. This will help us transition gradually from glMatrix functions to gpuMatrix functions. Still some work to do in gpuBindMatrices. See TODO comments in gpu_matrix.c for specifics. |
Commit Details:
Full Hash: 7a60f889d3f328e38aa882891cda615a06333ab6
Parent Commit: e636529
Lines Changed: +162, -26
16 Modified Paths:
/source/blender/gpu/GPU_matrix.h (+8, -0) (Diff)
/source/blender/gpu/intern/gpu_immediate.c (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_matrix.c (+114, -13) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_flat_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_no_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_uniform_color_outline_smooth_vert.glsl (+2, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_uniform_color_smooth_vert.glsl (+2, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_point_varying_size_varying_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_texture_vert.glsl (+4, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_no_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_point_fixed_size_varying_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_no_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_varying_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/intern/gpu_immediate.c (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_matrix.c (+114, -13) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_flat_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_no_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_uniform_color_outline_smooth_vert.glsl (+2, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_point_uniform_size_uniform_color_smooth_vert.glsl (+2, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_point_varying_size_varying_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_2D_texture_vert.glsl (+4, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_no_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_point_fixed_size_varying_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_no_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_varying_color_vert.glsl (+3, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_3D_smooth_color_vert.glsl (+3, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021