From 1398c6dfa4aae6b2b91eb05370e7c4c5bdfb693f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 9 Apr 2020 15:13:25 -0400 Subject: [PATCH] cogl: Remove some unused #define GL_BLAH safeties None of these constants are referenced in the files defining them. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1194 --- cogl/cogl/cogl-attribute.c | 5 ----- cogl/cogl/cogl-context.c | 5 ----- cogl/cogl/cogl-pixel-buffer.c | 16 ---------------- 3 files changed, 26 deletions(-) diff --git a/cogl/cogl/cogl-attribute.c b/cogl/cogl/cogl-attribute.c index 6c1842e17..1c0c88d0b 100644 --- a/cogl/cogl/cogl-attribute.c +++ b/cogl/cogl/cogl-attribute.c @@ -51,11 +51,6 @@ #include #include -/* This isn't defined in the GLES headers */ -#ifndef GL_UNSIGNED_INT -#define GL_UNSIGNED_INT 0x1405 -#endif - static void _cogl_attribute_free (CoglAttribute *attribute); COGL_OBJECT_DEFINE (Attribute, attribute); diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c index e6effb008..dc99f3508 100644 --- a/cogl/cogl/cogl-context.c +++ b/cogl/cogl/cogl-context.c @@ -51,11 +51,6 @@ #include #include -/* These aren't defined in the GLES headers */ -#ifndef GL_POINT_SPRITE -#define GL_POINT_SPRITE 0x8861 -#endif - static void _cogl_context_free (CoglContext *context); COGL_OBJECT_DEFINE (Context, context); diff --git a/cogl/cogl/cogl-pixel-buffer.c b/cogl/cogl/cogl-pixel-buffer.c index 7abebaccc..d7d383971 100644 --- a/cogl/cogl/cogl-pixel-buffer.c +++ b/cogl/cogl/cogl-pixel-buffer.c @@ -51,22 +51,6 @@ #include "cogl-pixel-buffer.h" #include "cogl-gtype-private.h" -/* - * GL/GLES compatibility defines for the buffer API: - */ - -#if defined (HAVE_COGL_GL) - -#ifndef GL_PIXEL_UNPACK_BUFFER -#define GL_PIXEL_UNPACK_BUFFER GL_PIXEL_UNPACK_BUFFER_ARB -#endif - -#ifndef GL_PIXEL_PACK_BUFFER -#define GL_PIXEL_PACK_BUFFER GL_PIXEL_PACK_BUFFER_ARB -#endif - -#endif - static void _cogl_pixel_buffer_free (CoglPixelBuffer *buffer);