From 8b0289a5ba059190aa223e46a462a83220f71660 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 17 Oct 2019 16:53:29 -0400 Subject: [PATCH] cogl: Remove unused COGL_FEATURE_ID_DEPTH_RANGE https://gitlab.gnome.org/GNOME/mutter/merge_requests/866 --- cogl/cogl/cogl-context.h | 2 -- cogl/cogl/cogl-depth-state.h | 7 ------- cogl/cogl/driver/gl/gl/cogl-driver-gl.c | 1 - cogl/cogl/driver/gl/gles/cogl-driver-gles.c | 1 - 4 files changed, 11 deletions(-) diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h index 7d40e1b60..51cce956f 100644 --- a/cogl/cogl/cogl-context.h +++ b/cogl/cogl/cogl-context.h @@ -185,7 +185,6 @@ cogl_is_context (void *object); * @COGL_FEATURE_ID_UNSIGNED_INT_INDICES: Set if * %COGL_INDICES_TYPE_UNSIGNED_INT is supported in * cogl_indices_new(). - * @COGL_FEATURE_ID_DEPTH_RANGE: cogl_pipeline_set_depth_range() support * @COGL_FEATURE_ID_POINT_SPRITE: Whether * cogl_pipeline_set_layer_point_sprite_coords_enabled() is supported. * @COGL_FEATURE_ID_PER_VERTEX_POINT_SIZE: Whether cogl_point_size_in @@ -219,7 +218,6 @@ typedef enum _CoglFeatureID COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE, COGL_FEATURE_ID_ONSCREEN_MULTIPLE, COGL_FEATURE_ID_UNSIGNED_INT_INDICES, - COGL_FEATURE_ID_DEPTH_RANGE, COGL_FEATURE_ID_POINT_SPRITE, COGL_FEATURE_ID_MAP_BUFFER_FOR_READ, COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, diff --git a/cogl/cogl/cogl-depth-state.h b/cogl/cogl/cogl-depth-state.h index 20c8c8ab0..39962011b 100644 --- a/cogl/cogl/cogl-depth-state.h +++ b/cogl/cogl/cogl-depth-state.h @@ -225,13 +225,6 @@ cogl_depth_state_get_test_function (CoglDepthState *state); * mapped too although the range must still lye within the range [0, * 1]. * - * If your driver does not support this feature (for example you are - * using GLES 1 drivers) then if you don't use the default range - * values you will get an error reported when calling - * cogl_pipeline_set_depth_state (). You can check ahead of time for - * the %COGL_FEATURE_ID_DEPTH_RANGE feature with - * cogl_has_feature() to know if this function will succeed. - * * By default normalized device coordinate depth values are mapped to * the full range of depth buffer values, [0, 1]. * diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c index 4cb133b2a..72a71db02 100644 --- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c @@ -398,7 +398,6 @@ _cogl_driver_update_features (CoglContext *ctx, | COGL_FEATURE_DEPTH_RANGE); COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_UNSIGNED_INT_INDICES, TRUE); - COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_DEPTH_RANGE, TRUE); COGL_FLAGS_SET (ctx->features, COGL_FEATURE_ID_MIRRORED_REPEAT, TRUE); _cogl_feature_check_ext_functions (ctx, diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c index 35f65386f..083c678b0 100644 --- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c @@ -306,7 +306,6 @@ _cogl_driver_update_features (CoglContext *context, * repeat modes other than CLAMP_TO_EDGE. */ flags |= COGL_FEATURE_DEPTH_RANGE; COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_OFFSCREEN, TRUE); - COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_DEPTH_RANGE, TRUE); COGL_FLAGS_SET (context->features, COGL_FEATURE_ID_MIRRORED_REPEAT, TRUE); COGL_FLAGS_SET (context->features,