[mutter/wip/nielsdg/add-yuv-support-gnome-3-32] cogl: fix rename of cogl-colorspace-conversion to cogl-pixel-format-conversion
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/nielsdg/add-yuv-support-gnome-3-32] cogl: fix rename of cogl-colorspace-conversion to cogl-pixel-format-conversion
- Date: Thu, 23 May 2019 13:13:31 +0000 (UTC)
commit 8d833c565ba2d42a827465039b9d5390700bcab2
Author: Marc Leeman <marc leeman gmail com>
Date: Thu May 23 13:13:22 2019 +0000
cogl: fix rename of cogl-colorspace-conversion to cogl-pixel-format-conversion
cogl/cogl/cogl-pixel-format-conversion.c | 2 +-
cogl/cogl/cogl.h | 2 +-
cogl/cogl/meson.build | 2 +-
src/wayland/meta-wayland-egl-stream.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/cogl/cogl/cogl-pixel-format-conversion.c b/cogl/cogl/cogl-pixel-format-conversion.c
index 3acdd8bb1..6b505705e 100644
--- a/cogl/cogl/cogl-pixel-format-conversion.c
+++ b/cogl/cogl/cogl-pixel-format-conversion.c
@@ -21,7 +21,7 @@
#include "cogl-object-private.h"
#include "cogl-gtype-private.h"
-#include "cogl-pixel_format-conversion.h"
+#include "cogl-pixel-format-conversion.h"
#include "cogl-snippet.h"
#include "cogl-pipeline-layer-state.h"
#include "cogl-pipeline-state.h"
diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h
index 41c785627..eb9aa6b3b 100644
--- a/cogl/cogl/cogl.h
+++ b/cogl/cogl/cogl.h
@@ -61,7 +61,7 @@
#include <cogl/cogl1-context.h>
#include <cogl/cogl-bitmap.h>
#include <cogl/cogl-color.h>
-#include <cogl/cogl-colorspace-conversion.h>
+#include <cogl/cogl-pixel-format-conversion.h>
#include <cogl/cogl-matrix.h>
#include <cogl/cogl-matrix-stack.h>
#include <cogl/cogl-offscreen.h>
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 0a10af7eb..0c3fe56e2 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -254,7 +254,7 @@ cogl_sources = [
'cogl-clip-stack.c',
'cogl-color-private.h',
'cogl-color.c',
- 'cogl-colorspace-conversion.c',
+ 'cogl-pixel-format-conversion.c',
'cogl-feature-private.c',
'cogl-feature-private.h',
'cogl-buffer-private.h',
diff --git a/src/wayland/meta-wayland-egl-stream.c b/src/wayland/meta-wayland-egl-stream.c
index 33fd96311..50a574455 100644
--- a/src/wayland/meta-wayland-egl-stream.c
+++ b/src/wayland/meta-wayland-egl-stream.c
@@ -249,7 +249,7 @@ meta_wayland_egl_stream_create_texture (MetaWaylandEglStream *stream,
return NULL;
}
- stream->texture = cogl_multi_plane_texture_new_single_plane (format, texture_2d);
+ stream->texture = cogl_multi_plane_texture_new_single_plane (COGL_PIXEL_FORMAT_ANY, texture_2d);
stream->is_y_inverted = !!y_inverted;
return stream->texture;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]