From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- intern/opencolorio/ocio_capi.h | 179 +++++++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 80 deletions(-) (limited to 'intern/opencolorio/ocio_capi.h') diff --git a/intern/opencolorio/ocio_capi.h b/intern/opencolorio/ocio_capi.h index bc1667398fb..9af302647a3 100644 --- a/intern/opencolorio/ocio_capi.h +++ b/intern/opencolorio/ocio_capi.h @@ -26,14 +26,17 @@ extern "C" { struct OCIO_GLSLDrawState; -#define OCIO_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name - -#define OCIO_ROLE_SCENE_LINEAR "scene_linear" -#define OCIO_ROLE_COLOR_PICKING "color_picking" -#define OCIO_ROLE_TEXTURE_PAINT "texture_paint" -#define OCIO_ROLE_DEFAULT_BYTE "default_byte" -#define OCIO_ROLE_DEFAULT_FLOAT "default_float" -#define OCIO_ROLE_DEFAULT_SEQUENCER "default_sequencer" +#define OCIO_DECLARE_HANDLE(name) \ + typedef struct name##__ { \ + int unused; \ + } * name + +#define OCIO_ROLE_SCENE_LINEAR "scene_linear" +#define OCIO_ROLE_COLOR_PICKING "color_picking" +#define OCIO_ROLE_TEXTURE_PAINT "texture_paint" +#define OCIO_ROLE_DEFAULT_BYTE "default_byte" +#define OCIO_ROLE_DEFAULT_FLOAT "default_float" +#define OCIO_ROLE_DEFAULT_SEQUENCER "default_sequencer" OCIO_DECLARE_HANDLE(OCIO_ConstConfigRcPtr); OCIO_DECLARE_HANDLE(OCIO_ConstColorSpaceRcPtr); @@ -47,66 +50,64 @@ OCIO_DECLARE_HANDLE(OCIO_MatrixTransformRcPtr); OCIO_DECLARE_HANDLE(OCIO_ConstLookRcPtr); /* Standard XYZ to linear sRGB transform, for fallback. */ -static const float OCIO_XYZ_TO_LINEAR_SRGB[3][3] = { - {3.2404542f, -0.9692660f, 0.0556434f}, - {-1.5371385f, 1.8760108f, -0.2040259f}, - {-0.4985314f, 0.0415560f, 1.0572252f}}; - +static const float OCIO_XYZ_TO_LINEAR_SRGB[3][3] = {{3.2404542f, -0.9692660f, 0.0556434f}, + {-1.5371385f, 1.8760108f, -0.2040259f}, + {-0.4985314f, 0.0415560f, 1.0572252f}}; /* This structure is used to pass curve mapping settings from * blender's DNA structure stored in view transform settings * to a generic OpenColorIO C-API. */ typedef struct OCIO_CurveMappingSettings { - /* This is a LUT which contain values for all 4 curve mapping tables - * (combined, R, G and B). - * - * Element I for table T is stored at I * 4 + T element of this LUT. - * - * This array is usually returned by curvemapping_table_RGBA(). - */ - float *lut; - - /* Size of single curve mapping table, 1/4 size of lut array. */ - int lut_size; - - /* Extend extrapolation flags for all the tables. - * if use_extend_extrapolate[T] != 0 means extrapolation for - * table T is needed. - */ - int use_extend_extrapolate[4]; - - /* Minimal X value of the curve mapping tables. */ - float mintable[4]; - - /* Per curve mapping table range. */ - float range[4]; - - /* Lower extension value, stored as per-component arrays. */ - float ext_in_x[4], ext_in_y[4]; - - /* Higher extension value, stored as per-component arrays. */ - float ext_out_x[4], ext_out_y[4]; - - /* First points of the tables, both X and Y values. - * Needed for easier and faster access when extrapolating. - */ - float first_x[4], first_y[4]; - - /* Last points of the tables, both X and Y values. - * Needed for easier and faster access when extrapolating. - */ - float last_x[4], last_y[4]; - - /* Premultiplication settings: black level and scale to match - * with white level. - */ - float black[3], bwmul[3]; - - /* Cache id of the original curve mapping, used to detect when - * upload of new settings to GPU is needed. - */ - size_t cache_id; + /* This is a LUT which contain values for all 4 curve mapping tables + * (combined, R, G and B). + * + * Element I for table T is stored at I * 4 + T element of this LUT. + * + * This array is usually returned by curvemapping_table_RGBA(). + */ + float *lut; + + /* Size of single curve mapping table, 1/4 size of lut array. */ + int lut_size; + + /* Extend extrapolation flags for all the tables. + * if use_extend_extrapolate[T] != 0 means extrapolation for + * table T is needed. + */ + int use_extend_extrapolate[4]; + + /* Minimal X value of the curve mapping tables. */ + float mintable[4]; + + /* Per curve mapping table range. */ + float range[4]; + + /* Lower extension value, stored as per-component arrays. */ + float ext_in_x[4], ext_in_y[4]; + + /* Higher extension value, stored as per-component arrays. */ + float ext_out_x[4], ext_out_y[4]; + + /* First points of the tables, both X and Y values. + * Needed for easier and faster access when extrapolating. + */ + float first_x[4], first_y[4]; + + /* Last points of the tables, both X and Y values. + * Needed for easier and faster access when extrapolating. + */ + float last_x[4], last_y[4]; + + /* Premultiplication settings: black level and scale to match + * with white level. + */ + float black[3], bwmul[3]; + + /* Cache id of the original curve mapping, used to detect when + * upload of new settings to GPU is needed. + */ + size_t cache_id; } OCIO_CurveMappingSettings; void OCIO_init(void); @@ -116,14 +117,15 @@ OCIO_ConstConfigRcPtr *OCIO_getCurrentConfig(void); void OCIO_setCurrentConfig(const OCIO_ConstConfigRcPtr *config); OCIO_ConstConfigRcPtr *OCIO_configCreateFromEnv(void); -OCIO_ConstConfigRcPtr *OCIO_configCreateFromFile(const char* filename); +OCIO_ConstConfigRcPtr *OCIO_configCreateFromFile(const char *filename); OCIO_ConstConfigRcPtr *OCIO_configCreateFallback(void); void OCIO_configRelease(OCIO_ConstConfigRcPtr *config); int OCIO_configGetNumColorSpaces(OCIO_ConstConfigRcPtr *config); const char *OCIO_configGetColorSpaceNameByIndex(OCIO_ConstConfigRcPtr *config, int index); -OCIO_ConstColorSpaceRcPtr *OCIO_configGetColorSpace(OCIO_ConstConfigRcPtr *config, const char *name); +OCIO_ConstColorSpaceRcPtr *OCIO_configGetColorSpace(OCIO_ConstConfigRcPtr *config, + const char *name); int OCIO_configGetIndexForColorSpace(OCIO_ConstConfigRcPtr *config, const char *name); int OCIO_colorSpaceIsInvertible(OCIO_ConstColorSpaceRcPtr *cs); @@ -132,25 +134,30 @@ int OCIO_colorSpaceIsData(OCIO_ConstColorSpaceRcPtr *cs); void OCIO_colorSpaceRelease(OCIO_ConstColorSpaceRcPtr *cs); const char *OCIO_configGetDefaultDisplay(OCIO_ConstConfigRcPtr *config); -int OCIO_configGetNumDisplays(OCIO_ConstConfigRcPtr *config); +int OCIO_configGetNumDisplays(OCIO_ConstConfigRcPtr *config); const char *OCIO_configGetDisplay(OCIO_ConstConfigRcPtr *config, int index); const char *OCIO_configGetDefaultView(OCIO_ConstConfigRcPtr *config, const char *display); -int OCIO_configGetNumViews(OCIO_ConstConfigRcPtr *config, const char *display); +int OCIO_configGetNumViews(OCIO_ConstConfigRcPtr *config, const char *display); const char *OCIO_configGetView(OCIO_ConstConfigRcPtr *config, const char *display, int index); -const char *OCIO_configGetDisplayColorSpaceName(OCIO_ConstConfigRcPtr *config, const char *display, const char *view); +const char *OCIO_configGetDisplayColorSpaceName(OCIO_ConstConfigRcPtr *config, + const char *display, + const char *view); -void OCIO_configGetDefaultLumaCoefs(OCIO_ConstConfigRcPtr *config, float *rgb); -void OCIO_configGetXYZtoRGB(OCIO_ConstConfigRcPtr *config, float xyz_to_rgb[3][3]); +void OCIO_configGetDefaultLumaCoefs(OCIO_ConstConfigRcPtr *config, float *rgb); +void OCIO_configGetXYZtoRGB(OCIO_ConstConfigRcPtr *config, float xyz_to_rgb[3][3]); -int OCIO_configGetNumLooks(OCIO_ConstConfigRcPtr *config); -const char *OCIO_configGetLookNameByIndex(OCIO_ConstConfigRcPtr *config, int index); +int OCIO_configGetNumLooks(OCIO_ConstConfigRcPtr *config); +const char *OCIO_configGetLookNameByIndex(OCIO_ConstConfigRcPtr *config, int index); OCIO_ConstLookRcPtr *OCIO_configGetLook(OCIO_ConstConfigRcPtr *config, const char *name); const char *OCIO_lookGetProcessSpace(OCIO_ConstLookRcPtr *look); void OCIO_lookRelease(OCIO_ConstLookRcPtr *look); -OCIO_ConstProcessorRcPtr *OCIO_configGetProcessorWithNames(OCIO_ConstConfigRcPtr *config, const char *srcName, const char *dstName); -OCIO_ConstProcessorRcPtr *OCIO_configGetProcessor(OCIO_ConstConfigRcPtr *config, OCIO_ConstTransformRcPtr *transform); +OCIO_ConstProcessorRcPtr *OCIO_configGetProcessorWithNames(OCIO_ConstConfigRcPtr *config, + const char *srcName, + const char *dstName); +OCIO_ConstProcessorRcPtr *OCIO_configGetProcessor(OCIO_ConstConfigRcPtr *config, + OCIO_ConstTransformRcPtr *transform); void OCIO_processorApply(OCIO_ConstProcessorRcPtr *processor, OCIO_PackedImageDesc *img); void OCIO_processorApply_predivide(OCIO_ConstProcessorRcPtr *processor, OCIO_PackedImageDesc *img); @@ -168,14 +175,21 @@ OCIO_DisplayTransformRcPtr *OCIO_createDisplayTransform(void); void OCIO_displayTransformSetInputColorSpaceName(OCIO_DisplayTransformRcPtr *dt, const char *name); void OCIO_displayTransformSetDisplay(OCIO_DisplayTransformRcPtr *dt, const char *name); void OCIO_displayTransformSetView(OCIO_DisplayTransformRcPtr *dt, const char *name); -void OCIO_displayTransformSetDisplayCC(OCIO_DisplayTransformRcPtr *dt, OCIO_ConstTransformRcPtr *et); -void OCIO_displayTransformSetLinearCC(OCIO_DisplayTransformRcPtr *dt, OCIO_ConstTransformRcPtr *et); +void OCIO_displayTransformSetDisplayCC(OCIO_DisplayTransformRcPtr *dt, + OCIO_ConstTransformRcPtr *et); +void OCIO_displayTransformSetLinearCC(OCIO_DisplayTransformRcPtr *dt, + OCIO_ConstTransformRcPtr *et); void OCIO_displayTransformSetLooksOverride(OCIO_DisplayTransformRcPtr *dt, const char *looks); void OCIO_displayTransformSetLooksOverrideEnabled(OCIO_DisplayTransformRcPtr *dt, bool enabled); void OCIO_displayTransformRelease(OCIO_DisplayTransformRcPtr *dt); -OCIO_PackedImageDesc *OCIO_createOCIO_PackedImageDesc(float *data, long width, long height, long numChannels, - long chanStrideBytes, long xStrideBytes, long yStrideBytes); +OCIO_PackedImageDesc *OCIO_createOCIO_PackedImageDesc(float *data, + long width, + long height, + long numChannels, + long chanStrideBytes, + long xStrideBytes, + long yStrideBytes); void OCIO_PackedImageDescRelease(OCIO_PackedImageDesc *p); @@ -184,14 +198,19 @@ void OCIO_exponentTransformSetValue(OCIO_ExponentTransformRcPtr *et, const float void OCIO_exponentTransformRelease(OCIO_ExponentTransformRcPtr *et); OCIO_MatrixTransformRcPtr *OCIO_createMatrixTransform(void); -void OCIO_matrixTransformSetValue(OCIO_MatrixTransformRcPtr *mt, const float *m44, const float *offset4); +void OCIO_matrixTransformSetValue(OCIO_MatrixTransformRcPtr *mt, + const float *m44, + const float *offset4); void OCIO_matrixTransformRelease(OCIO_MatrixTransformRcPtr *mt); void OCIO_matrixTransformScale(float *m44, float *offset4, const float *scale4); int OCIO_supportGLSLDraw(void); -int OCIO_setupGLSLDraw(struct OCIO_GLSLDrawState **state_r, OCIO_ConstProcessorRcPtr *processor, - OCIO_CurveMappingSettings *curve_mapping_settings, float dither, bool predivide); +int OCIO_setupGLSLDraw(struct OCIO_GLSLDrawState **state_r, + OCIO_ConstProcessorRcPtr *processor, + OCIO_CurveMappingSettings *curve_mapping_settings, + float dither, + bool predivide); void OCIO_finishGLSLDraw(struct OCIO_GLSLDrawState *state); void OCIO_freeOGLState(struct OCIO_GLSLDrawState *state); -- cgit v1.2.3