isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Remove unused TEXTURE_RECTANGLE feature flag

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/546
This commit is contained in:
Adam Jackson 2019-04-18 12:32:32 -04:00
parent ca2be8ef5b
commit 9ab3a02a8a
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cogl/cogl/cogl-context.h
View File

@ -174,8 +174,6 @@ cogl_is_context (void *object);
* experimental since it's only useable with experimental API... */ * experimental since it's only useable with experimental API... */
/** /**
* CoglFeatureID: * CoglFeatureID:
* @COGL_FEATURE_ID_TEXTURE_RECTANGLE: Support for rectangular
* textures with non-normalized texture coordinates.
* @COGL_FEATURE_ID_TEXTURE_RG: Support for * @COGL_FEATURE_ID_TEXTURE_RG: Support for
* %COGL_TEXTURE_COMPONENTS_RG as the internal components of a * %COGL_TEXTURE_COMPONENTS_RG as the internal components of a
* texture. * texture.
@ -219,7 +217,6 @@ cogl_is_context (void *object);
*/ */
typedef enum _CoglFeatureID typedef enum _CoglFeatureID
{ {
COGL_FEATURE_ID_TEXTURE_RECTANGLE = 1,
COGL_FEATURE_ID_OFFSCREEN, COGL_FEATURE_ID_OFFSCREEN,
COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE, COGL_FEATURE_ID_OFFSCREEN_MULTISAMPLE,
COGL_FEATURE_ID_ONSCREEN_MULTIPLE, COGL_FEATURE_ID_ONSCREEN_MULTIPLE,

2
cogl/cogl/cogl-types.h
View File

@ -315,7 +315,6 @@ typedef enum /*< prefix=COGL_PIXEL_FORMAT >*/
/** /**
* CoglFeatureFlags: * CoglFeatureFlags:
* @COGL_FEATURE_TEXTURE_RECTANGLE: ARB_texture_rectangle support
* @COGL_FEATURE_TEXTURE_YUV: ycbcr conversion support * @COGL_FEATURE_TEXTURE_YUV: ycbcr conversion support
* @COGL_FEATURE_TEXTURE_READ_PIXELS: glReadPixels() support * @COGL_FEATURE_TEXTURE_READ_PIXELS: glReadPixels() support
* @COGL_FEATURE_OFFSCREEN: FBO support * @COGL_FEATURE_OFFSCREEN: FBO support
@ -344,7 +343,6 @@ typedef enum /*< prefix=COGL_PIXEL_FORMAT >*/
*/ */
typedef enum typedef enum
{ {
COGL_FEATURE_TEXTURE_RECTANGLE = (1 << 1),
COGL_FEATURE_TEXTURE_YUV = (1 << 3), COGL_FEATURE_TEXTURE_YUV = (1 << 3),
COGL_FEATURE_TEXTURE_READ_PIXELS = (1 << 4), COGL_FEATURE_TEXTURE_READ_PIXELS = (1 << 4),
COGL_FEATURE_OFFSCREEN = (1 << 6), COGL_FEATURE_OFFSCREEN = (1 << 6),

7
cogl/cogl/driver/gl/gl/cogl-driver-gl.c
View File

@ -456,13 +456,6 @@ _cogl_driver_update_features (CoglContext *ctx,
COGL_FEATURE_ID_MAP_BUFFER_FOR_WRITE, TRUE); 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) if (ctx->glEGLImageTargetTexture2D)
COGL_FLAGS_SET (private_features, COGL_FLAGS_SET (private_features,
COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE, TRUE); COGL_PRIVATE_FEATURE_TEXTURE_2D_FROM_EGL_IMAGE, TRUE);

6
cogl/test-fixtures/test-utils.c
View File

@ -24,12 +24,6 @@ check_flags (TestFlags flags,
return FALSE; 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 && if (flags & TEST_REQUIREMENT_TEXTURE_RG &&
!cogl_has_feature (test_ctx, COGL_FEATURE_ID_TEXTURE_RG)) !cogl_has_feature (test_ctx, COGL_FEATURE_ID_TEXTURE_RG))
{ {