[mutter] cogl: Remove unused TEXTURE_RECTANGLE feature flag
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: Remove unused TEXTURE_RECTANGLE feature flag
- Date: Thu, 18 Apr 2019 19:07:06 +0000 (UTC)
commit 9ab3a02a8ab5d37240bb10b952b1ea959977d2cd
Author: Adam Jackson <ajax redhat com>
Date: Thu Apr 18 12:32:32 2019 -0400
cogl: Remove unused TEXTURE_RECTANGLE feature flag
https://gitlab.gnome.org/GNOME/mutter/merge_requests/546
cogl/cogl/cogl-context.h | 3 ---
cogl/cogl/cogl-types.h | 2 --
cogl/cogl/driver/gl/gl/cogl-driver-gl.c | 7 -------
cogl/test-fixtures/test-utils.c | 6 ------
4 files changed, 18 deletions(-)
---
diff --git a/cogl/cogl/cogl-context.h b/cogl/cogl/cogl-context.h
index a32e38dba..ae501bdbb 100644
--- a/cogl/cogl/cogl-context.h
+++ b/cogl/cogl/cogl-context.h
@@ -174,8 +174,6 @@ cogl_is_context (void *object);
* experimental since it's only useable with experimental API... */
/**
* CoglFeatureID:
- * @COGL_FEATURE_ID_TEXTURE_RECTANGLE: Support for rectangular
- * textures with non-normalized texture coordinates.
* @COGL_FEATURE_ID_TEXTURE_RG: Support for
* %COGL_TEXTURE_COMPONENTS_RG as the internal components of a
* texture.
@@ -219,7 +217,6 @@ cogl_is_context (void *object);
*/
typedef enum _CoglFeatureID
{
- COGL_FEATURE_ID_TEXTURE_RECTANGLE = 1,
COGL_FEATURE_ID_OFFSCREEN,
COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE,
COGL_FEATURE_ID_ONSCREEN_MULTIPLE,
diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h
index 70b2937a5..ca3dbc85d 100644
--- a/cogl/cogl/cogl-types.h
+++ b/cogl/cogl/cogl-types.h
@@ -315,7 +315,6 @@ typedef enum /*< prefix=COGL_PIXEL_FORMAT >*/
/**
* CoglFeatureFlags:
- * @COGL_FEATURE_TEXTURE_RECTANGLE: ARB_texture_rectangle support
* @COGL_FEATURE_TEXTURE_YUV: ycbcr conversion support
* @COGL_FEATURE_TEXTURE_READ_PIXELS: glReadPixels() support
* @COGL_FEATURE_OFFSCREEN: FBO support
@@ -344,7 +343,6 @@ typedef enum /*< prefix=COGL_PIXEL_FORMAT >*/
*/
typedef enum
{
- COGL_FEATURE_TEXTURE_RECTANGLE = (1 << 1),
COGL_FEATURE_TEXTURE_YUV = (1 << 3),
COGL_FEATURE_TEXTURE_READ_PIXELS = (1 << 4),
COGL_FEATURE_OFFSCREEN = (1 << 6),
diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
index 57afe5e32..fb36df2b8 100644
--- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
@@ -456,13 +456,6 @@ _cogl_driver_update_features (CoglContext *ctx,
COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE);
}
- if (_cogl_check_extension ("GL_ARB_texture_rectangle", gl_extensions))
- {
- flags |= COGL_FEATURE_TEXTURE_RECTANGLE;
- COGL_FLAGS_SET (ctx->features,
- COGL_FEATURE_ID_TEXTURE_RECTANGLE, TRUE);
- }
-
if (ctx->glEGLImageTargetTexture2D)
COGL_FLAGS_SET (private_features,
COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE, TRUE);
diff --git a/cogl/test-fixtures/test-utils.c b/cogl/test-fixtures/test-utils.c
index c77a90a7c..b8af0b6d1 100644
--- a/cogl/test-fixtures/test-utils.c
+++ b/cogl/test-fixtures/test-utils.c
@@ -24,12 +24,6 @@ check_flags (TestFlags flags,
return FALSE;
}
- if (flags & TEST_REQUIREMENT_TEXTURE_RECTANGLE &&
- !cogl_has_feature (test_ctx, COGL_FEATURE_ID_TEXTURE_RECTANGLE))
- {
- return FALSE;
- }
-
if (flags & TEST_REQUIREMENT_TEXTURE_RG &&
!cogl_has_feature (test_ctx, COGL_FEATURE_ID_TEXTURE_RG))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]