[mutter] cogl: Remove now-unused CoglGpuInfo



commit d6f5ac56038d86c13e90df1571f52e0da8e16d4b
Author: Adam Jackson <ajax redhat com>
Date:   Wed Jun 17 18:53:19 2020 -0400

    cogl: Remove now-unused CoglGpuInfo
    
    This had been an entirely-too-GL-aware collection of renderer queries,
    mostly to work around driver bugs and handle software drivers
    intelligently. The driver workarounds have been removed (fix your
    driver, and if you can't because it's closed-source, fix that first),
    and we now delegate the am-i-software-or-not logic to the backend, so
    this can all go
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1194

 cogl/cogl/cogl-context-private.h            |   5 -
 cogl/cogl/cogl-context.c                    |   1 -
 cogl/cogl/cogl-gpu-info-private.h           | 112 ------
 cogl/cogl/cogl-gpu-info.c                   | 572 ----------------------------
 cogl/cogl/driver/gl/gl/cogl-driver-gl.c     |   2 -
 cogl/cogl/driver/gl/gles/cogl-driver-gles.c |   2 -
 cogl/cogl/driver/nop/cogl-driver-nop.c      |   2 -
 cogl/cogl/meson.build                       |   2 -
 8 files changed, 698 deletions(-)
---
diff --git a/cogl/cogl/cogl-context-private.h b/cogl/cogl/cogl-context-private.h
index 8dc5c2c23b..4151f3bf7f 100644
--- a/cogl/cogl/cogl-context-private.h
+++ b/cogl/cogl/cogl-context-private.h
@@ -46,7 +46,6 @@
 #include "cogl-pipeline-cache.h"
 #include "cogl-texture-2d.h"
 #include "cogl-sampler-cache-private.h"
-#include "cogl-gpu-info-private.h"
 #include "cogl-gl-header.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-onscreen-private.h"
@@ -70,10 +69,6 @@ struct _CoglContext
 
   CoglDriver driver;
 
-  /* Information about the GPU and driver which we can use to
-     determine certain workarounds */
-  CoglGpuInfo gpu;
-
   /* vtables for the driver functions */
   const CoglDriverVtable *driver_vtable;
   const CoglTextureDriver *texture_driver;
diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c
index bc92ec38e8..1d84cf544f 100644
--- a/cogl/cogl/cogl-context.c
+++ b/cogl/cogl/cogl-context.c
@@ -45,7 +45,6 @@
 #include "cogl-onscreen-private.h"
 #include "cogl-attribute-private.h"
 #include "cogl1-context.h"
-#include "cogl-gpu-info-private.h"
 #include "cogl-gtype-private.h"
 #include "winsys/cogl-winsys-private.h"
 
diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
index 29492b04c7..42351c4d80 100644
--- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
+++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c
@@ -419,8 +419,6 @@ _cogl_driver_update_features (CoglContext *ctx,
 
   _cogl_get_gl_version (ctx, &gl_major, &gl_minor);
 
-  _cogl_gpu_info_init (ctx, &ctx->gpu);
-
   ctx->glsl_major = 1;
   ctx->glsl_minor = 2;
   ctx->glsl_version_to_use = 120;
diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
index 04e35c56ad..d85d2f9f20 100644
--- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
@@ -282,8 +282,6 @@ _cogl_driver_update_features (CoglContext *context,
   context->glsl_minor = 0;
   context->glsl_version_to_use = 100;
 
-  _cogl_gpu_info_init (context, &context->gpu);
-
   if (!_cogl_get_gl_version (context, &gl_major, &gl_minor))
     {
       gl_major = 1;
diff --git a/cogl/cogl/driver/nop/cogl-driver-nop.c b/cogl/cogl/driver/nop/cogl-driver-nop.c
index 664c653dbc..5edd93a22a 100644
--- a/cogl/cogl/driver/nop/cogl-driver-nop.c
+++ b/cogl/cogl/driver/nop/cogl-driver-nop.c
@@ -45,8 +45,6 @@ static gboolean
 _cogl_driver_update_features (CoglContext *ctx,
                               GError **error)
 {
-  /* _cogl_gpu_info_init (ctx, &ctx->gpu); */
-
   memset (ctx->private_features, 0, sizeof (ctx->private_features));
 
   return TRUE;
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 21f6d8c0cf..a4383dc3d0 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -208,8 +208,6 @@ cogl_sources = [
   'cogl-debug.h',
   'cogl-debug-options.h',
   'cogl-dma-buf-handle.c',
-  'cogl-gpu-info.c',
-  'cogl-gpu-info-private.h',
   'cogl-context-private.h',
   'cogl-context.c',
   'cogl-renderer-private.h',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]