Commit 58afcdc1 authored by Sergey Ulanov's avatar Sergey Ulanov Committed by Commit Bot

[Fuchsia] Enable ozone_demo and ozone_gl_unittests targets

Also enabled gl_image_native_pixmap.cc on Fuchisa. ExportHandle() is
currently stubbed as NOTIMPLEMENTED.

Bug: 852011, 766360
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I2978a320fef928f32b3ff27473c593293a8168d6
Reviewed-on: https://chromium-review.googlesource.com/1112592Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarMichael Spang <spang@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569912}
parent fe617cd7
...@@ -260,16 +260,10 @@ group("gn_all") { ...@@ -260,16 +260,10 @@ group("gn_all") {
deps += [ deps += [
"//ui/ozone", "//ui/ozone",
"//ui/ozone:ozone_unittests", "//ui/ozone:ozone_unittests",
"//ui/ozone/demo",
"//ui/ozone/gl:ozone_gl_unittests",
] ]
# TODO(crbug.com/766360): These require a working GL implementation.
if (!is_fuchsia) {
deps += [
"//ui/ozone/demo",
"//ui/ozone/gl:ozone_gl_unittests",
]
}
if (ozone_platform_x11) { if (ozone_platform_x11) {
deps += [ "//ui/ozone:ozone_x11_unittests" ] deps += [ "//ui/ozone:ozone_x11_unittests" ]
} }
......
...@@ -191,7 +191,7 @@ component("gl") { ...@@ -191,7 +191,7 @@ component("gl") {
"gl_surface_egl.h", "gl_surface_egl.h",
] ]
if (is_linux || (is_win && use_ozone)) { if (is_linux || use_ozone) {
sources += [ sources += [
"gl_image_native_pixmap.cc", "gl_image_native_pixmap.cc",
"gl_image_native_pixmap.h", "gl_image_native_pixmap.h",
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
#include <vector> #include <vector>
#include "base/files/scoped_file.h"
#include "build/build_config.h"
#include "ui/gfx/buffer_format_util.h" #include "ui/gfx/buffer_format_util.h"
#include "ui/gl/egl_util.h" #include "ui/gl/egl_util.h"
#include "ui/gl/gl_context.h" #include "ui/gl/gl_context.h"
...@@ -282,6 +284,11 @@ gfx::NativePixmapHandle GLImageNativePixmap::ExportHandle() { ...@@ -282,6 +284,11 @@ gfx::NativePixmapHandle GLImageNativePixmap::ExportHandle() {
} }
} }
#if defined(OS_FUCHSIA)
// TODO(crbug.com/852011): Implement image handle export on Fuchsia.
NOTIMPLEMENTED();
return gfx::NativePixmapHandle();
#else // defined(OS_FUCHSIA)
std::vector<int> fds(num_planes); std::vector<int> fds(num_planes);
std::vector<EGLint> strides(num_planes); std::vector<EGLint> strides(num_planes);
std::vector<EGLint> offsets(num_planes); std::vector<EGLint> offsets(num_planes);
...@@ -317,6 +324,7 @@ gfx::NativePixmapHandle GLImageNativePixmap::ExportHandle() { ...@@ -317,6 +324,7 @@ gfx::NativePixmapHandle GLImageNativePixmap::ExportHandle() {
} }
return handle; return handle;
#endif // !defined(OS_FUCHSIA)
} }
unsigned GLImageNativePixmap::GetInternalFormat() { unsigned GLImageNativePixmap::GetInternalFormat() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment