[Bf-blender-cvs] [a698709] master: Code cleanup: remove unused color management functions

Sergey Sharybin noreply at git.blender.org
Wed Dec 4 10:59:36 CET 2013


Commit: a698709d956f01ff4a2a1c0d27450c6880dd2ad5
Author: Sergey Sharybin
Date:   Wed Dec 4 15:57:54 2013 +0600
http://developer.blender.org/rBa698709d956f01ff4a2a1c0d27450c6880dd2ad5

Code cleanup: remove unused color management functions

===================================================================

M	source/blender/imbuf/IMB_colormanagement.h
M	source/blender/imbuf/intern/colormanagement.c

===================================================================

diff --git a/source/blender/imbuf/IMB_colormanagement.h b/source/blender/imbuf/IMB_colormanagement.h
index 8af8638..09cdb3a 100644
--- a/source/blender/imbuf/IMB_colormanagement.h
+++ b/source/blender/imbuf/IMB_colormanagement.h
@@ -191,11 +191,6 @@ bool IMB_colormanagement_setup_glsl_draw_from_space_ctx(const struct bContext *C
 /* Finish GLSL-based display space conversion */
 void IMB_colormanagement_finish_glsl_draw(void);
 
-/* Configures GLSL shader for conversion from space defined by role to scene linear space */
-bool IMB_colormanagement_setup_transform_from_role_glsl(int role, bool predivide);
-/* Finish GLSL-based color space conversion */
-void IMB_colormanagement_finish_glsl_transform(void);
-
 /* Roles */
 enum {
 	COLOR_ROLE_SCENE_LINEAR = 0,
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 6e6aefa..3542e99 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -3147,36 +3147,3 @@ void IMB_colormanagement_finish_glsl_draw(void)
 {
 	OCIO_finishGLSLDraw(global_glsl_state.ocio_glsl_state);
 }
-
-/* ** Color space conversion using GLSL shader  ** */
-
-/**
- * Configures GLSL shader for conversion from space defined by role
- * to scene linear space
- *
- * Will create appropriate OCIO processor and setup GLSL shader,
- * so further 2D texture usage will use this conversion.
- *
- * Role is an pseudonym for a color space, see bottom of file
- * IMB_colormanagement.h for list of available roles.
- *
- * When there's no need to apply transform on 2D textures, use
- * IMB_colormanagement_finish_glsl_transform().
- */
-bool IMB_colormanagement_setup_transform_from_role_glsl(int role, bool predivide)
-{
-	OCIO_ConstProcessorRcPtr *processor;
-	ColorSpace *colorspace;
-
-	colorspace = colormanage_colorspace_get_roled(role);
-
-	processor = colorspace_to_scene_linear_processor(colorspace);
-
-	return OCIO_setupGLSLDraw(&global_glsl_state.transform_ocio_glsl_state, processor, NULL, predivide);
-}
-
-/* Finish GLSL-based color space conversion */
-void IMB_colormanagement_finish_glsl_transform(void)
-{
-	OCIO_finishGLSLDraw(global_glsl_state.transform_ocio_glsl_state);
-}




More information about the Bf-blender-cvs mailing list