Skip to content

Commit be4bc52

Browse files
committed
Remove gles3 code
1 parent 6bad32a commit be4bc52

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

flutter/shell/platform/tizen/external_texture_pixel_egl.cc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77
#include <EGL/egl.h>
88
#include <EGL/eglext.h>
9-
#include <GLES3/gl32.h>
9+
#include <GLES2/gl2.h>
10+
#include <GLES2/gl2ext.h>
1011

1112
namespace flutter {
1213

@@ -21,7 +22,7 @@ bool ExternalTexturePixelEGL::PopulateTexture(
2122
// Populate the texture object used by the engine.
2223
opengl_texture->target = GL_TEXTURE_2D;
2324
opengl_texture->name = state_->gl_texture;
24-
opengl_texture->format = GL_RGBA8;
25+
opengl_texture->format = GL_RGBA8_OES;
2526
opengl_texture->destruction_callback = nullptr;
2627
opengl_texture->user_data = nullptr;
2728
opengl_texture->width = width;
@@ -54,8 +55,8 @@ bool ExternalTexturePixelEGL::CopyPixelBuffer(size_t& width, size_t& height) {
5455
if (state_->gl_texture == 0) {
5556
glGenTextures(1, static_cast<GLuint*>(&state_->gl_texture));
5657
glBindTexture(GL_TEXTURE_2D, static_cast<GLuint>(state_->gl_texture));
57-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
58-
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
58+
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER_OES);
59+
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER_OES);
5960
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
6061
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
6162
} else {

flutter/shell/platform/tizen/external_texture_pixel_egl_impeller.cc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include <EGL/egl.h>
88
#include <EGL/eglext.h>
9-
#include <GLES3/gl32.h>
109

1110
#include "flutter/shell/platform/tizen/logger.h"
1211

@@ -30,12 +29,16 @@ bool ExternalTexturePixelEGLImpeller::PopulateTexture(
3029
width = pixel_buffer->width;
3130
height = pixel_buffer->height;
3231

32+
// TODO(jsuya): The values ​​below do not exist in embedder.h because the
33+
// engine changes were removed.
34+
// https://github.com/flutter-tizen/engine/pull/368
35+
// opengl_texture->impeller_texture_type =
36+
// FlutterGLImpellerTextureType::kFlutterGLImpellerTexturePixelBuffer;
37+
// opengl_texture->buffer = pixel_buffer->buffer;
38+
// opengl_texture->buffer_size =
39+
// size_t(pixel_buffer->width) * size_t(pixel_buffer->height) * 4;
40+
3341
// Populate the texture object used by the engine.
34-
opengl_texture->impeller_texture_type =
35-
FlutterGLImpellerTextureType::kFlutterGLImpellerTexturePixelBuffer;
36-
opengl_texture->buffer = pixel_buffer->buffer;
37-
opengl_texture->buffer_size =
38-
size_t(pixel_buffer->width) * size_t(pixel_buffer->height) * 4;
3942
opengl_texture->destruction_callback = nullptr;
4043
opengl_texture->user_data = nullptr;
4144
opengl_texture->width = width;

flutter/shell/platform/tizen/external_texture_surface_egl.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <EGL/eglext.h>
99
#include <GLES2/gl2.h>
1010
#include <GLES2/gl2ext.h>
11-
#include <GLES3/gl32.h>
1211
#include <tbm_bufmgr.h>
1312
#include <tbm_surface.h>
1413
#include <tbm_surface_internal.h>
@@ -141,9 +140,9 @@ bool ExternalTextureSurfaceEGL::PopulateTexture(
141140
static_cast<GLuint>(state_->gl_texture));
142141
// set the texture wrapping parameters
143142
glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_S,
144-
GL_CLAMP_TO_BORDER);
143+
GL_CLAMP_TO_BORDER_OES);
145144
glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_WRAP_T,
146-
GL_CLAMP_TO_BORDER);
145+
GL_CLAMP_TO_BORDER_OES);
147146
// set texture filtering parameters
148147
glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
149148
glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -163,7 +162,7 @@ bool ExternalTextureSurfaceEGL::PopulateTexture(
163162
}
164163
opengl_texture->target = GL_TEXTURE_EXTERNAL_OES;
165164
opengl_texture->name = state_->gl_texture;
166-
opengl_texture->format = GL_RGBA8;
165+
opengl_texture->format = GL_RGBA8_OES;
167166
opengl_texture->destruction_callback = nullptr;
168167
opengl_texture->user_data = nullptr;
169168
opengl_texture->width = width;

flutter/shell/platform/tizen/external_texture_surface_egl_impeller.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <EGL/eglext.h>
99
#include <GLES2/gl2.h>
1010
#include <GLES2/gl2ext.h>
11-
#include <GLES3/gl32.h>
1211
#include <tbm_bufmgr.h>
1312
#include <tbm_surface.h>
1413
#include <tbm_surface_internal.h>
@@ -59,9 +58,9 @@ bool ExternalTextureSurfaceEGLImpeller::PopulateTexture(
5958
return false;
6059
}
6160

62-
opengl_texture->impeller_texture_type =
63-
FlutterGLImpellerTextureType::kFlutterGLImpellerTextureGpuSurface;
64-
opengl_texture->bind_callback = OnBindCallback;
61+
// opengl_texture->impeller_texture_type =
62+
// FlutterGLImpellerTextureType::kFlutterGLImpellerTextureGpuSurface;
63+
// opengl_texture->bind_callback = OnBindCallback;
6564
opengl_texture->destruction_callback = nullptr;
6665
opengl_texture->user_data = this;
6766
opengl_texture->width = width;

0 commit comments

Comments
 (0)