brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl/driver: Harmonize GL naming

Browse Source 
Following what we did for TextureDriverGL and DriverGL, take the
opportunity to mark various headers as private while renaming them.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4132>
This commit is contained in:
Bilal Elmoussaoui 2024-12-11 17:03:47 +01:00
parent fdee2ed8ff
commit 2769c25cf7
23 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cogl/cogl/cogl-renderer.c
View File

@ -54,12 +54,12 @@
#endif #endif
#ifdef HAVE_GL #ifdef HAVE_GL
#include "cogl/driver/gl/gl/cogl-driver-gl3-private.h" #include "cogl/driver/gl/gl3/cogl-driver-gl3-private.h"
#include "cogl/driver/gl/gl/cogl-texture-driver-gl3-private.h" #include "cogl/driver/gl/gl3/cogl-texture-driver-gl3-private.h"
#endif #endif
#ifdef HAVE_GLES2 #ifdef HAVE_GLES2
#include "cogl/driver/gl/gles/cogl-driver-gles2-private.h" #include "cogl/driver/gl/gles2/cogl-driver-gles2-private.h"
#include "cogl/driver/gl/gles/cogl-texture-driver-gles2-private.h" #include "cogl/driver/gl/gles2/cogl-texture-driver-gles2-private.h"
#endif #endif
#include "cogl/driver/nop/cogl-driver-nop-private.h" #include "cogl/driver/nop/cogl-driver-nop-private.h"

2
cogl/cogl/driver/gl/cogl-attribute-gl.c
View File

@ -42,7 +42,7 @@
#include "cogl/cogl-attribute-private.h" #include "cogl/cogl-attribute-private.h"
#include "cogl/driver/gl/cogl-attribute-gl-private.h" #include "cogl/driver/gl/cogl-attribute-gl-private.h"
#include "cogl/driver/gl/cogl-buffer-gl-private.h" #include "cogl/driver/gl/cogl-buffer-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-progend-glsl-private.h" #include "cogl/driver/gl/cogl-pipeline-progend-glsl-private.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"

2
cogl/cogl/driver/gl/cogl-clip-stack-gl.c
View File

@ -39,7 +39,7 @@
#include "cogl/cogl-graphene.h" #include "cogl/cogl-graphene.h"
#include "cogl/cogl-primitives-private.h" #include "cogl/cogl-primitives-private.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/driver/gl/cogl-clip-stack-gl-private.h" #include "cogl/driver/gl/cogl-clip-stack-gl-private.h"
#include "mtk/mtk.h" #include "mtk/mtk.h"

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

@ -27,7 +27,7 @@
*/ */
#include "cogl/driver/gl/cogl-driver-gl-private.h" #include "cogl/driver/gl/cogl-driver-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/driver/gl/cogl-buffer-gl-private.h" #include "cogl/driver/gl/cogl-buffer-gl-private.h"
#include "cogl/driver/gl/cogl-clip-stack-gl-private.h" #include "cogl/driver/gl/cogl-clip-stack-gl-private.h"
#include "cogl/driver/gl/cogl-attribute-gl-private.h" #include "cogl/driver/gl/cogl-attribute-gl-private.h"

2
cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
View File

@ -43,7 +43,7 @@
#include "cogl/cogl-snippet-private.h" #include "cogl/cogl-snippet-private.h"
#include "cogl/cogl-list.h" #include "cogl/cogl-list.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/cogl-context-private.h" #include "cogl/cogl-context-private.h"
#include "cogl/cogl-pipeline-cache.h" #include "cogl/cogl-pipeline-cache.h"

0
cogl/cogl/driver/gl/cogl-pipeline-opengl-private.h → cogl/cogl/driver/gl/cogl-pipeline-gl-private.h
View File

2
cogl/cogl/driver/gl/cogl-pipeline-opengl.c → cogl/cogl/driver/gl/cogl-pipeline-gl.c
View File

@ -40,7 +40,7 @@
#include "cogl/cogl-framebuffer-private.h" #include "cogl/cogl-framebuffer-private.h"
#include "cogl/cogl-offscreen.h" #include "cogl/cogl-offscreen.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/driver/gl/cogl-texture-gl-private.h" #include "cogl/driver/gl/cogl-texture-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-progend-glsl-private.h" #include "cogl/driver/gl/cogl-pipeline-progend-glsl-private.h"

2
cogl/cogl/driver/gl/cogl-pipeline-progend-glsl.c
View File

@ -40,7 +40,7 @@
#include "cogl/cogl-pipeline-private.h" #include "cogl/cogl-pipeline-private.h"
#include "cogl/cogl-offscreen.h" #include "cogl/cogl-offscreen.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/cogl-context-private.h" #include "cogl/cogl-context-private.h"
#include "cogl/cogl-pipeline-cache.h" #include "cogl/cogl-pipeline-cache.h"

2
cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
View File

@ -39,7 +39,7 @@
#include "cogl/cogl-feature-private.h" #include "cogl/cogl-feature-private.h"
#include "cogl/cogl-pipeline-private.h" #include "cogl/cogl-pipeline-private.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/cogl-context-private.h" #include "cogl/cogl-context-private.h"
#include "cogl/cogl-pipeline-state-private.h" #include "cogl/cogl-pipeline-state-private.h"

2
cogl/cogl/driver/gl/cogl-texture-2d-gl.c
View File

@ -41,7 +41,7 @@
#include "cogl/cogl-texture-2d-private.h" #include "cogl/cogl-texture-2d-private.h"
#include "cogl/driver/gl/cogl-texture-2d-gl-private.h" #include "cogl/driver/gl/cogl-texture-2d-gl-private.h"
#include "cogl/driver/gl/cogl-texture-gl-private.h" #include "cogl/driver/gl/cogl-texture-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#if defined (HAVE_EGL) #if defined (HAVE_EGL)

2
cogl/cogl/driver/gl/cogl-texture-driver-gl.c
View File

@ -28,7 +28,7 @@
#include "config.h" #include "config.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/driver/gl/cogl-texture-driver-gl-private.h" #include "cogl/driver/gl/cogl-texture-driver-gl-private.h"
#include "cogl/driver/gl/cogl-texture-2d-gl-private.h" #include "cogl/driver/gl/cogl-texture-2d-gl-private.h"
#include "cogl/driver/gl/cogl-texture-gl-private.h" #include "cogl/driver/gl/cogl-texture-gl-private.h"

2
cogl/cogl/driver/gl/cogl-texture-gl.c
View File

@ -35,7 +35,7 @@
#include "cogl/cogl-util.h" #include "cogl/cogl-util.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#include "cogl/driver/gl/cogl-texture-gl-private.h" #include "cogl/driver/gl/cogl-texture-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
static inline int static inline int
calculate_alignment (int rowstride) calculate_alignment (int rowstride)

2
cogl/cogl/driver/gl/cogl-util-gl.c
View File

@ -37,7 +37,7 @@
#include "cogl/driver/gl/cogl-framebuffer-gl-private.h" #include "cogl/driver/gl/cogl-framebuffer-gl-private.h"
#include "cogl/driver/gl/cogl-gl-framebuffer-fbo.h" #include "cogl/driver/gl/cogl-gl-framebuffer-fbo.h"
#include "cogl/driver/gl/cogl-gl-framebuffer-back.h" #include "cogl/driver/gl/cogl-gl-framebuffer-back.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#ifdef COGL_ENABLE_DEBUG #ifdef COGL_ENABLE_DEBUG

0
cogl/cogl/driver/gl/gl/cogl-driver-gl3-private.h → cogl/cogl/driver/gl/gl3/cogl-driver-gl3-private.h
View File

2
cogl/cogl/driver/gl/gl/cogl-driver-gl3.c → cogl/cogl/driver/gl/gl3/cogl-driver-gl3.c
View File

@ -32,7 +32,7 @@
#include <string.h> #include <string.h>
#include "cogl/driver/gl/gl/cogl-driver-gl3-private.h" #include "cogl/driver/gl/gl3/cogl-driver-gl3-private.h"
#include "cogl/cogl-private.h" #include "cogl/cogl-private.h"
#include "cogl/cogl-feature-private.h" #include "cogl/cogl-feature-private.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"

0
cogl/cogl/driver/gl/gl/cogl-texture-driver-gl3-private.h → cogl/cogl/driver/gl/gl3/cogl-texture-driver-gl3-private.h
View File

4
cogl/cogl/driver/gl/gl/cogl-texture-driver-gl3.c → cogl/cogl/driver/gl/gl3/cogl-texture-driver-gl3.c
View File

@ -43,8 +43,8 @@
#include "cogl/cogl-texture-2d-private.h" #include "cogl/cogl-texture-2d-private.h"
#include "cogl/cogl-pipeline.h" #include "cogl/cogl-pipeline.h"
#include "cogl/cogl-context-private.h" #include "cogl/cogl-context-private.h"
#include "cogl/driver/gl/gl/cogl-texture-driver-gl3-private.h" #include "cogl/driver/gl/gl3/cogl-texture-driver-gl3-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#include "cogl/driver/gl/cogl-texture-gl-private.h" #include "cogl/driver/gl/cogl-texture-gl-private.h"
#include "cogl/driver/gl/cogl-bitmap-gl-private.h" #include "cogl/driver/gl/cogl-bitmap-gl-private.h"

0
cogl/cogl/driver/gl/gles/cogl-driver-gles2-private.h → cogl/cogl/driver/gl/gles2/cogl-driver-gles2-private.h
View File

2
cogl/cogl/driver/gl/gles/cogl-driver-gles2.c → cogl/cogl/driver/gl/gles2/cogl-driver-gles2.c
View File

@ -32,7 +32,7 @@
#include <string.h> #include <string.h>
#include "cogl/driver/gl/gles/cogl-driver-gles2-private.h" #include "cogl/driver/gl/gles2/cogl-driver-gles2-private.h"
#include "cogl/cogl-context-private.h" #include "cogl/cogl-context-private.h"
#include "cogl/cogl-feature-private.h" #include "cogl/cogl-feature-private.h"
#include "cogl/cogl-private.h" #include "cogl/cogl-private.h"

0
cogl/cogl/driver/gl/gles/cogl-texture-driver-gles2-private.h → cogl/cogl/driver/gl/gles2/cogl-texture-driver-gles2-private.h
View File

4
cogl/cogl/driver/gl/gles/cogl-texture-driver-gles2.c → cogl/cogl/driver/gl/gles2/cogl-texture-driver-gles2.c
View File

@ -42,8 +42,8 @@
#include "cogl/cogl-texture-private.h" #include "cogl/cogl-texture-private.h"
#include "cogl/cogl-pipeline.h" #include "cogl/cogl-pipeline.h"
#include "cogl/cogl-context-private.h" #include "cogl/cogl-context-private.h"
#include "cogl/driver/gl/gles/cogl-texture-driver-gles2-private.h" #include "cogl/driver/gl/gles2/cogl-texture-driver-gles2-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#include "cogl/driver/gl/cogl-texture-gl-private.h" #include "cogl/driver/gl/cogl-texture-gl-private.h"
#include "cogl/driver/gl/cogl-bitmap-gl-private.h" #include "cogl/driver/gl/cogl-bitmap-gl-private.h"

20
cogl/cogl/meson.build
View File

@ -94,8 +94,8 @@ cogl_common_driver_sources = [
'driver/gl/cogl-gl-framebuffer-fbo.h', 'driver/gl/cogl-gl-framebuffer-fbo.h',
'driver/gl/cogl-pipeline-fragend-glsl-private.h', 'driver/gl/cogl-pipeline-fragend-glsl-private.h',
'driver/gl/cogl-pipeline-fragend-glsl.c', 'driver/gl/cogl-pipeline-fragend-glsl.c',
'driver/gl/cogl-pipeline-opengl-private.h', 'driver/gl/cogl-pipeline-gl-private.h',
'driver/gl/cogl-pipeline-opengl.c', 'driver/gl/cogl-pipeline-gl.c',
'driver/gl/cogl-pipeline-progend-glsl-private.h', 'driver/gl/cogl-pipeline-progend-glsl-private.h',
'driver/gl/cogl-pipeline-progend-glsl.c', 'driver/gl/cogl-pipeline-progend-glsl.c',
'driver/gl/cogl-pipeline-vertend-glsl-private.h', 'driver/gl/cogl-pipeline-vertend-glsl-private.h',
@ -111,17 +111,17 @@ cogl_common_driver_sources = [
] ]
gl_driver_sources = [ gl_driver_sources = [
'driver/gl/gl/cogl-driver-gl3.c', 'driver/gl/gl3/cogl-driver-gl3.c',
'driver/gl/gl/cogl-driver-gl3-private.h', 'driver/gl/gl3/cogl-driver-gl3-private.h',
'driver/gl/gl/cogl-texture-driver-gl3.c', 'driver/gl/gl3/cogl-texture-driver-gl3.c',
'driver/gl/gl/cogl-texture-driver-gl3-private.h', 'driver/gl/gl3/cogl-texture-driver-gl3-private.h',
] ]
gles_driver_sources = [ gles_driver_sources = [
'driver/gl/gles/cogl-driver-gles2.c', 'driver/gl/gles2/cogl-driver-gles2.c',
'driver/gl/gles/cogl-driver-gles2-private.h', 'driver/gl/gles2/cogl-driver-gles2-private.h',
'driver/gl/gles/cogl-texture-driver-gles2.c', 'driver/gl/gles2/cogl-texture-driver-gles2.c',
'driver/gl/gles/cogl-texture-driver-gles2-private.h', 'driver/gl/gles2/cogl-texture-driver-gles2-private.h',
] ]
cogl_driver_sources = [ cogl_driver_sources = [

2
cogl/cogl/winsys/cogl-winsys-glx.c
View File

@ -44,7 +44,7 @@
#include "cogl/cogl-onscreen-private.h" #include "cogl/cogl-onscreen-private.h"
#include "cogl/cogl-xlib-renderer.h" #include "cogl/cogl-xlib-renderer.h"
#include "cogl/cogl-util.h" #include "cogl/cogl-util.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-gl-private.h"
#include "cogl/winsys/cogl-glx-renderer-private.h" #include "cogl/winsys/cogl-glx-renderer-private.h"
#include "cogl/winsys/cogl-glx-display-private.h" #include "cogl/winsys/cogl-glx-display-private.h"
#include "cogl/winsys/cogl-onscreen-glx.h" #include "cogl/winsys/cogl-onscreen-glx.h"