diff --git a/cogl/cogl/deprecated/cogl-material-compat.c b/cogl/cogl/deprecated/cogl-material-compat.c index 5a8543367..ac59a3af7 100644 --- a/cogl/cogl/deprecated/cogl-material-compat.c +++ b/cogl/cogl/deprecated/cogl-material-compat.c @@ -104,15 +104,3 @@ cogl_material_set_layer (CoglMaterial *material, cogl_pipeline_set_layer_texture (COGL_PIPELINE (material), layer_index, texture); } - -gboolean -cogl_material_set_layer_combine (CoglMaterial *material, - int layer_index, - const char *blend_string, - GError **error) -{ - return cogl_pipeline_set_layer_combine (COGL_PIPELINE (material), - layer_index, - blend_string, - error); -} diff --git a/cogl/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h index 6f4dc58e8..cfe483b0b 100644 --- a/cogl/cogl/deprecated/cogl-material-compat.h +++ b/cogl/cogl/deprecated/cogl-material-compat.h @@ -419,106 +419,6 @@ cogl_material_set_layer (CoglMaterial *material, int layer_index, CoglHandle texture); -/** - * cogl_material_set_layer_combine: - * @material: A #CoglMaterial object - * @layer_index: Specifies the layer you want define a combine function for - * @blend_string: A Cogl blend string - * describing the desired texture combine function. - * @error: A #GError that may report parse errors or lack of GPU/driver - * support. May be %NULL, in which case a warning will be printed out if an - * error is encountered. - * - * If not already familiar; you can refer - * here for an overview of what blend - * strings are and there syntax. - * - * These are all the functions available for texture combining: - * - * REPLACE(arg0) = arg0 - * MODULATE(arg0, arg1) = arg0 x arg1 - * ADD(arg0, arg1) = arg0 + arg1 - * ADD_SIGNED(arg0, arg1) = arg0 + arg1 - 0.5 - * INTERPOLATE(arg0, arg1, arg2) = arg0 x arg2 + arg1 x (1 - arg2) - * SUBTRACT(arg0, arg1) = arg0 - arg1 - * - * - * DOT3_RGB(arg0, arg1) = 4 x ((arg0[R] - 0.5)) * (arg1[R] - 0.5) + - * (arg0[G] - 0.5)) * (arg1[G] - 0.5) + - * (arg0[B] - 0.5)) * (arg1[B] - 0.5)) - * - * - * - * - * DOT3_RGBA(arg0, arg1) = 4 x ((arg0[R] - 0.5)) * (arg1[R] - 0.5) + - * (arg0[G] - 0.5)) * (arg1[G] - 0.5) + - * (arg0[B] - 0.5)) * (arg1[B] - 0.5)) - * - * - * - * - * Refer to the - * color-source syntax for - * describing the arguments. The valid source names for texture combining - * are: - * - * - * TEXTURE - * Use the color from the current texture layer - * - * - * TEXTURE_0, TEXTURE_1, etc - * Use the color from the specified texture layer - * - * - * CONSTANT - * Use the color from the constant given with - * cogl_material_set_layer_constant() - * - * - * PRIMARY - * Use the color of the material as set with - * cogl_material_set_color() - * - * - * PREVIOUS - * Either use the texture color from the previous layer, or - * if this is layer 0, use the color of the material as set with - * cogl_material_set_color() - * - * - * - * - * Layer Combine Examples - * This is effectively what the default blending is: - * - * RGBA = MODULATE (PREVIOUS, TEXTURE) - * - * This could be used to cross-fade between two images, using - * the alpha component of a constant as the interpolator. The constant - * color is given by calling cogl_material_set_layer_constant. - * - * RGBA = INTERPOLATE (PREVIOUS, TEXTURE, CONSTANT[A]) - * - * - * - * You can't give a multiplication factor for arguments as you can - * with blending. - * - * Return value: %TRUE if the blend string was successfully parsed, and the - * described texture combining is supported by the underlying driver and - * or hardware. On failure, %FALSE is returned and @error is set - * - * Since: 1.0 - * Deprecated: 1.16: Use cogl_pipeline_set_layer_combine() instead - */ -COGL_DEPRECATED_FOR (cogl_pipeline_set_layer_combine) -COGL_EXPORT gboolean -cogl_material_set_layer_combine (CoglMaterial *material, - int layer_index, - const char *blend_string, - GError **error); - G_END_DECLS #endif /* __COGL_MATERIAL_H__ */