Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: ui/gl/init/gl_factory_x11.cc

Issue 2680423002: Introducing 2 usages for SwiftShader (Closed)
Patch Set: Added missing change to GpuDataManagerImplPrivate Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gl/init/gl_factory_x11.cc
diff --git a/ui/gl/init/gl_factory_x11.cc b/ui/gl/init/gl_factory_x11.cc
index 0b7fc2db01450291dc8808702ddd7d77f2ae636b..38a4d2210d6e193d4ff6b40952fa54f09335c748 100644
--- a/ui/gl/init/gl_factory_x11.cc
+++ b/ui/gl/init/gl_factory_x11.cc
@@ -31,6 +31,7 @@ std::vector<GLImplementation> GetAllowedGLImplementations() {
impls.push_back(kGLImplementationDesktopGL);
impls.push_back(kGLImplementationEGLGLES2);
impls.push_back(kGLImplementationOSMesaGL);
+ impls.push_back(kGLImplementationSwiftShaderGL);
return impls;
}
@@ -56,6 +57,7 @@ scoped_refptr<GLContext> CreateGLContext(GLShareGroup* share_group,
case kGLImplementationDesktopGL:
return InitializeGLContext(new GLContextGLX(share_group),
compatible_surface, attribs);
+ case kGLImplementationSwiftShaderGL:
case kGLImplementationEGLGLES2:
return InitializeGLContext(new GLContextEGL(share_group),
compatible_surface, attribs);
@@ -80,6 +82,7 @@ scoped_refptr<GLSurface> CreateViewGLSurface(gfx::AcceleratedWidget window) {
return InitializeGLSurface(new GLSurfaceOSMesaX11(window));
case kGLImplementationDesktopGL:
return InitializeGLSurface(new GLSurfaceGLXX11(window));
+ case kGLImplementationSwiftShaderGL:
case kGLImplementationEGLGLES2:
DCHECK(window != gfx::kNullAcceleratedWidget);
return InitializeGLSurface(new NativeViewGLSurfaceEGLX11(window));
@@ -103,6 +106,7 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
case kGLImplementationDesktopGL:
return InitializeGLSurfaceWithFormat(
new UnmappedNativeViewGLSurfaceGLX(size), format);
+ case kGLImplementationSwiftShaderGL:
case kGLImplementationEGLGLES2:
return InitializeGLSurfaceWithFormat(
new PbufferGLSurfaceEGL(size), format);

Powered by Google App Engine
This is Rietveld 408576698