diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-04 16:20:13 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-04 16:20:13 +0400 |
commit | c1b704a11aac13190054f42f2cd21a51c9132758 (patch) | |
tree | e306190d5ee56a621a2f20606b1b864000ad57b6 /source/blender/imbuf | |
parent | f6add59e912f0496d9cf7a41af8ce6917e7b62d8 (diff) |
Use GLSL display for compositor backdrop and sequencer preview
Now only background images remained to be ported. Plus implement
GLSL for dithering and RGB curves.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/IMB_colormanagement.h | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h index 58b55b0f137..314daed00dd 100644 --- a/source/blender/imbuf/IMB_colormanagement.h +++ b/source/blender/imbuf/IMB_colormanagement.h @@ -95,6 +95,10 @@ struct ImBuf *IMB_colormanagement_imbuf_for_write(struct ImBuf *ibuf, int save_a /* ** Public display buffers interfaces ** */ +void IMB_colormanagement_display_settings_from_ctx(const struct bContext *C, + struct ColorManagedViewSettings **view_settings_r, + struct ColorManagedDisplaySettings **display_settings_r); + unsigned char *IMB_display_buffer_acquire(struct ImBuf *ibuf, const struct ColorManagedViewSettings *view_settings, const struct ColorManagedDisplaySettings *display_settings, void **cache_handle); unsigned char *IMB_display_buffer_acquire_ctx(const struct bContext *C, struct ImBuf *ibuf, void **cache_handle); diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index a74f28e79c9..b8de1cf75d1 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -662,8 +662,9 @@ void colormanage_cache_free(ImBuf *ibuf) } } -static void display_transform_get_from_ctx(const bContext *C, ColorManagedViewSettings **view_settings_r, - ColorManagedDisplaySettings **display_settings_r) +void IMB_colormanagement_display_settings_from_ctx(const bContext *C, + ColorManagedViewSettings **view_settings_r, + ColorManagedDisplaySettings **display_settings_r) { Scene *scene = CTX_data_scene(C); SpaceImage *sima = CTX_wm_space_image(C); @@ -1963,7 +1964,7 @@ unsigned char *IMB_display_buffer_acquire_ctx(const bContext *C, ImBuf *ibuf, vo ColorManagedViewSettings *view_settings; ColorManagedDisplaySettings *display_settings; - display_transform_get_from_ctx(C, &view_settings, &display_settings); + IMB_colormanagement_display_settings_from_ctx(C, &view_settings, &display_settings); return IMB_display_buffer_acquire(ibuf, view_settings, display_settings, cache_handle); } @@ -2820,7 +2821,7 @@ int IMB_colormanagement_setup_glsl_draw_from_space_ctx(const struct bContext *C, ColorManagedViewSettings *view_settings; ColorManagedDisplaySettings *display_settings; - display_transform_get_from_ctx(C, &view_settings, &display_settings); + IMB_colormanagement_display_settings_from_ctx(C, &view_settings, &display_settings); return IMB_colormanagement_setup_glsl_draw_from_space(view_settings, display_settings, from_colorspace, predivide); } |