Skip to content

Commit c22289c

Browse files
committed
[Ozone] Testing
1 parent c04416c commit c22289c

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

cobalt/build/configs/linux-x64x11/args.gn

+7
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,19 @@ import("//cobalt/build/configs/chromium_linux-x64x11/args.gn")
22
import("//cobalt/build/configs/common.gn")
33

44
use_ozone = true
5+
ozone_auto_platforms = false
6+
ozone_platform = "starboard"
7+
angle_enable_gl = true
58

69
# Vulkan is a new rendering (and presentation, and more) API intended to replace
710
# E/GL(ES). Partners are only required to support upto GLES 2.0 : https://developers.google.com/youtube/cobalt/docs/reference/starboard/modules/16/gles#gles_version
811
# Disable Vulkan until we formally decide to support it.
912
enable_vulkan = false
1013

14+
# Angle supports multiple backends. If Vulkan is engaged (for tests, SwAngle),
15+
# then we don't want to have a real display.
16+
angle_use_vulkan_null_display = true
17+
1118
# Overriding flag from //media/media_options.gni.
1219
# Cobalt doesn't use //third_party/ffmpeg.
1320
media_use_ffmpeg = false

ui/gl/init/gl_display_initializer.cc

+1
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ void GetEGLInitDisplays(bool supports_angle_d3d,
111111
#else
112112
AddInitDisplay(init_displays, ANGLE_OPENGL);
113113
AddInitDisplay(init_displays, ANGLE_OPENGLES);
114+
AddInitDisplay(init_displays, ANGLE_OPENGLES_EGL);
114115
#endif // BUILDFLAG(IS_ANDROID)
115116
} else {
116117
if (requested_renderer == kANGLEImplementationOpenGLName) {

ui/ozone/platform/starboard/ozone_platform_starboard.cc

-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,6 @@ OzonePlatform* CreateOzonePlatformStarboard() {
173173
CHECK_EQ(cmd->GetSwitchValueASCII(switches::kUseGL),
174174
gl::kGLImplementationANGLEName)
175175
<< " Unsupported " << switches::kUseGL << " implementation";
176-
} else {
177-
cmd->AppendSwitchASCII(switches::kUseGL, gl::kGLImplementationANGLEName);
178176
}
179177

180178
return new OzonePlatformStarboard();

0 commit comments

Comments
 (0)