Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove ExternalTexture stub files #164

Merged
merged 2 commits into from
Aug 4, 2021
Merged

Remove ExternalTexture stub files #164

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f3dd22
Remove ExternalTexture stub files
swift-kim Aug 3, 2021
6afcb6a
Create a dummy external_texture_surface_gl_linux.cc
swift-kim Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions shell/platform/tizen/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ template("embedder") {
"channels/navigation_channel.cc",
"channels/platform_view_channel.cc",
"channels/text_input_channel.cc",
"external_texture_pixel_gl.cc",
"flutter_project_bundle.cc",
"flutter_tizen.cc",
"flutter_tizen_engine.cc",
Expand Down Expand Up @@ -153,7 +154,6 @@ template("embedder") {
"channels/platform_channel.cc",
"channels/settings_channel.cc",
"channels/settings_channel_tizen.cc",
"external_texture_pixel_gl.cc",
"external_texture_surface_gl.cc",
"system_utils_tizen.cc",
]
Expand All @@ -177,8 +177,6 @@ template("embedder") {
"channels/platform_channel_stub.cc",
"channels/settings_channel.cc",
"channels/settings_channel_linux.cc",
"external_texture_pixel_gl_stub.cc",
"external_texture_surface_gl_stub.cc",
"system_utils_linux.cc",
]
}
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/tizen/external_texture_pixel_gl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#ifdef TIZEN_RENDERER_EVAS_GL
#undef EFL_BETA_API_SUPPORT
#include <Evas_GL_GLES3_Helpers.h>
#include "tizen_evas_gl_helper.h"
extern Evas_GL* g_evas_gl;
EVAS_GL_GLOBAL_GLES3_DECLARE();
#else
Expand Down
29 changes: 0 additions & 29 deletions shell/platform/tizen/external_texture_pixel_gl_stub.cc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion shell/platform/tizen/external_texture_surface_gl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#ifdef TIZEN_RENDERER_EVAS_GL
#undef EFL_BETA_API_SUPPORT
#include <Evas_GL_GLES3_Helpers.h>
#include "tizen_evas_gl_helper.h"
extern Evas_GL* g_evas_gl;
EVAS_GL_GLOBAL_GLES3_DECLARE();
#else
Expand Down
38 changes: 0 additions & 38 deletions shell/platform/tizen/external_texture_surface_gl_stub.cc
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions shell/platform/tizen/flutter_tizen_texture_registrar.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
#include <mutex>

#include "flutter/shell/platform/tizen/external_texture_pixel_gl.h"
#ifndef __X64_SHELL__
#include "flutter/shell/platform/tizen/external_texture_surface_gl.h"
#endif
#include "flutter/shell/platform/tizen/flutter_tizen_engine.h"
#include "flutter/shell/platform/tizen/logger.h"

Expand Down Expand Up @@ -94,12 +96,14 @@ FlutterTizenTextureRegistrar::CreateExternalTexture(
texture_info->pixel_buffer_config.callback,
texture_info->pixel_buffer_config.user_data);
break;
#ifndef __X64_SHELL__
case kFlutterDesktopGpuBufferTexture:
return std::make_unique<ExternalTextureSurfaceGL>(
texture_info->gpu_buffer_config.callback,
texture_info->gpu_buffer_config.destruction_callback,
texture_info->gpu_buffer_config.user_data);
break;
#endif
default:
FT_LOG(Error) << "Invalid texture type.";
return nullptr;
Expand Down
13 changes: 2 additions & 11 deletions shell/platform/tizen/tizen_evas_gl_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
// Copyright 2021 Samsung Electronics Co., Ltd. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// This file has same content as tizen's file(Evas_GL_GLES3_Helpers.h).
// https://docs.tizen.org/application/native/api/mobile/6.0/group__Evas__GL__GLES3__Helpers.html

#ifndef EMBEDDER_TIZEN_EVAS_GL_HELPER_H_
#define EMBEDDER_TIZEN_EVAS_GL_HELPER_H_
// This file is a copy of Tizen's Evas_GL_GLES3_Helpers.h file.
// https://docs.tizen.org/application/native/api/wearable/5.5/group__Evas__GL__GLES3__Helpers.html

/**
* @file Evas_GL_GLES3_Helpers.h
Expand Down Expand Up @@ -683,5 +676,3 @@ evgl_init(...)
*/

#endif

#endif // EMBEDDER_TIZEN_EVAS_GL_HELPER_H_
4 changes: 0 additions & 4 deletions shell/platform/tizen/tizen_renderer_evas_gl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@

#include "tizen_renderer_evas_gl.h"

#ifdef __X64_SHELL__
#include "tizen_evas_gl_helper.h"
#else
#include <Evas_GL_GLES3_Helpers.h>
#endif
Evas_GL* g_evas_gl = nullptr;
EVAS_GL_GLOBAL_GLES3_DEFINE();

Expand Down