mirror of
https://github.com/brl/mutter.git
synced 2024-12-26 21:02:14 +00:00
cleanup: Make cogl includes consistent
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3491>
This commit is contained in:
parent
2317fbe7c4
commit
3b4fe5d577
@ -56,7 +56,7 @@
|
|||||||
#include "cogl/cogl-types.h"
|
#include "cogl/cogl-types.h"
|
||||||
|
|
||||||
|
|
||||||
#include <cogl/deprecated/cogl-shader.h>
|
#include "cogl/deprecated/cogl-shader.h"
|
||||||
|
|
||||||
#ifdef COGL_ENABLE_MUTTER_API
|
#ifdef COGL_ENABLE_MUTTER_API
|
||||||
#include "cogl/cogl-mutter.h"
|
#include "cogl/cogl-mutter.h"
|
||||||
@ -97,7 +97,7 @@
|
|||||||
#include "cogl/cogl-graphene.h"
|
#include "cogl/cogl-graphene.h"
|
||||||
/* XXX: This will definitely go away once all the Clutter winsys
|
/* XXX: This will definitely go away once all the Clutter winsys
|
||||||
* code has been migrated down into Cogl! */
|
* code has been migrated down into Cogl! */
|
||||||
#include <cogl/deprecated/cogl-clutter.h>
|
#include "cogl/deprecated/cogl-clutter.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SECTION:cogl
|
* SECTION:cogl
|
||||||
|
@ -19,8 +19,7 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <cogl/cogl.h>
|
#include "cogl/cogl.h"
|
||||||
|
|
||||||
#include "meta/meta-multi-texture-format.h"
|
#include "meta/meta-multi-texture-format.h"
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
@ -34,10 +34,11 @@
|
|||||||
|
|
||||||
#include "compositor/meta-multi-texture-format-private.h"
|
#include "compositor/meta-multi-texture-format-private.h"
|
||||||
|
|
||||||
#include <cogl/cogl.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "cogl/cogl.h"
|
||||||
|
|
||||||
static const char *shader_global_conversions =
|
static const char *shader_global_conversions =
|
||||||
"vec4 yuv_to_rgb(vec4 yuva) \n"
|
"vec4 yuv_to_rgb(vec4 yuva) \n"
|
||||||
"{ \n"
|
"{ \n"
|
||||||
|
@ -20,9 +20,9 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
#include <cogl/cogl.h>
|
|
||||||
#include <meta/common.h>
|
|
||||||
|
|
||||||
|
#include "cogl/cogl.h"
|
||||||
|
#include "meta/common.h"
|
||||||
#include "meta/meta-multi-texture-format.h"
|
#include "meta/meta-multi-texture-format.h"
|
||||||
|
|
||||||
G_BEGIN_DECLS
|
G_BEGIN_DECLS
|
||||||
|
Loading…
Reference in New Issue
Block a user