diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2016-10-13 02:01:59 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2016-10-13 03:36:52 +0300 |
commit | e79f302f1613adfb957c2f8f5fca50aba7f25259 (patch) | |
tree | f0ce5151d625f27cc4a95c310bd7a115fb578b45 /source/blender/gpu | |
parent | f6e7e46fac71eda949858edcf21fab79a5a2573f (diff) |
gawain/immediate mode: new util functions for color uniforms
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/gpu/GPU_immediate.h | 6 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_immediate.c | 16 |
3 files changed, 24 insertions, 0 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 668a948144a..2a5df19e7e8 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -32,6 +32,8 @@ set(INC ../makesdna ../makesrna + ../editors/include + # For node muting stuff... ../nodes ../nodes/intern diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h index 8e7f91b0f7f..96b8cbb22b0 100644 --- a/source/blender/gpu/GPU_immediate.h +++ b/source/blender/gpu/GPU_immediate.h @@ -37,3 +37,9 @@ /* Extend immBindProgram to use Blender’s library of built-in shader programs. * Use immUnbindProgram() when done. */ void immBindBuiltinProgram(GPUBuiltinShader); + +/* + * Extend immUniformColor to take Blender's themes + */ +void immUniformThemeColor(int colorid); +void immUniformThemeColorShade(int colorid, int offset);
\ No newline at end of file diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c index 5faedbae04d..444a8850452 100644 --- a/source/blender/gpu/intern/gpu_immediate.c +++ b/source/blender/gpu/intern/gpu_immediate.c @@ -27,6 +27,8 @@ #include "GPU_immediate.h" #include "GPU_matrix.h" +#include "UI_resources.h" + #include "gpu_shader_private.h" void immBindBuiltinProgram(GPUBuiltinShader shader_id) @@ -35,3 +37,17 @@ void immBindBuiltinProgram(GPUBuiltinShader shader_id) immBindProgram(shader->program); gpuBindMatrices(shader->program); } + +void immUniformThemeColor(int colorid) +{ + float color[4]; + UI_GetThemeColor4fv(colorid, color); + immUniformColor4fv(color); +} + +void immUniformThemeColorShade(int colorid, int offset) +{ + float color[4]; + UI_GetThemeColorShade4fv(colorid, offset, color); + immUniformColor4fv(color); +}
\ No newline at end of file |