diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-11-09 07:53:59 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-11-09 07:53:59 +0300 |
| commit | a0ae6d7116c289335a870b5ff5360f896af327ba (patch) | |
| tree | 635ab70eee2d5ff851ae396a66985cffb3f142c2 /source/blender/gpu/GPU_shader.h | |
| parent | 2b726b054e3385708b031bebb50c59f7cbb7c149 (diff) | |
OpenGL: manage built-in shaders better
As our library of built-in shaders grows, it's important to create, access, and discard them efficiently.
Lookup via GPU_shader_get_builtin is now constant time instead of linear (# of built-in shaders). This is called very often with our new immediate mode.
Creation and discard are unified.
Adding a new shader requires fewer steps.
365 lines shorter :D
Diffstat (limited to 'source/blender/gpu/GPU_shader.h')
| -rw-r--r-- | source/blender/gpu/GPU_shader.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index cf7e00d682c..91214c3e3db 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -85,11 +85,11 @@ int GPU_shader_get_attribute(GPUShader *shader, const char *name); /* Builtin/Non-generated shaders */ typedef enum GPUBuiltinShader { - GPU_SHADER_VSM_STORE = 0, - GPU_SHADER_SEP_GAUSSIAN_BLUR = 1, - GPU_SHADER_SMOKE = 2, - GPU_SHADER_SMOKE_FIRE = 3, - GPU_SHADER_SMOKE_COBA = 4, + GPU_SHADER_VSM_STORE, + GPU_SHADER_SEP_GAUSSIAN_BLUR, + GPU_SHADER_SMOKE, + GPU_SHADER_SMOKE_FIRE, + GPU_SHADER_SMOKE_COBA, /* specialized drawing */ GPU_SHADER_TEXT, @@ -123,6 +123,8 @@ typedef enum GPUBuiltinShader { GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_SMOOTH, GPU_SHADER_3D_POINT_VARYING_SIZE_UNIFORM_COLOR, GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR, + + GPU_NUM_BUILTIN_SHADERS /* (not an actual shader) */ } GPUBuiltinShader; GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader); |