diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2017-02-24 13:11:43 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2017-02-24 14:38:50 +0300 |
commit | 1e7475a5d7878642057ea0cb313b5ee0d4a8545e (patch) | |
tree | 7367c569551f13849c081aca731174289513b470 /source/blender/editors/mask | |
parent | 0584c82ad7c1c2f133f617c52de28be15f6840d4 (diff) |
Opengl glaDrawPixels removal: More descriptive setup.
Diffstat (limited to 'source/blender/editors/mask')
-rw-r--r-- | source/blender/editors/mask/mask_draw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c index f431efd80ee..e1d303965be 100644 --- a/source/blender/editors/mask/mask_draw.c +++ b/source/blender/editors/mask/mask_draw.c @@ -753,6 +753,7 @@ void ED_mask_draw_region(Mask *mask, ARegion *ar, } if (draw_flag & MASK_DRAWFLAG_OVERLAY) { + float red[4] = {1.0f, 0.0f, 0.0f, 0.0f}; float *buffer = threaded_mask_rasterize(mask, width, height); if (overlay_mode != MASK_OVERLAY_ALPHACHANNEL) { @@ -767,12 +768,10 @@ void ED_mask_draw_region(Mask *mask, ARegion *ar, if (stabmat) { glMultMatrixf((const float *) stabmat); } - GPUShader *shader = GPU_shader_get_builtin_shader(GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR); - GPU_shader_bind(shader); - float red[4] = {1.0f, 0.0f, 0.0f, 0.0f}; + GPUShader *shader = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR); GPU_shader_uniform_vector(shader, GPU_shader_get_uniform(shader, "shuffle"), 4, 1, red); immDrawPixelsTex(0.0f, 0.0f, width, height, GL_RED, GL_FLOAT, GL_NEAREST, buffer, 1.0f, 1.0f, NULL); - GPU_shader_unbind(); + glPopMatrix(); if (overlay_mode != MASK_OVERLAY_ALPHACHANNEL) { |