From 9c2202ffc22b4293b48a4edeafa1b5d2bab8bb83 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Sat, 18 Nov 2017 13:31:59 +0000 Subject: Revert "Add Atlas Text interface for rendering SDF glyphs." This reverts commit 39631f3df172feb385527a5d125bc53b0bded7e6. Reason for revert: break google3 rool Original change's description: > Add Atlas Text interface for rendering SDF glyphs. > > This new API is built upon SDF text atlas code from the GPU backend. Unlike using the GPU > backend to draw text, this set of interfaces allows the client to render the SDF glyphs. The > client issues text draws to potentially multiple targets and then the client flushes. The > client then gets commands from Skia with data to put into a texture atlas and vertices to > draw that reference the texture. The client is responsible for creating the texture, uploading > the SDF data to the texture, and drawing the vertices provided by Skia. > > Change-Id: Ie9447e19b85f0ce1c2b942e5216c787a74f335d3 > Reviewed-on: https://skia-review.googlesource.com/59360 > Commit-Queue: Brian Salomon > Reviewed-by: Robert Phillips TBR=jvanverth@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: I4aad0c99e645b476fd8ba25731f2a10e8802bb25 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/73420 Reviewed-by: Greg Daniel Commit-Queue: Greg Daniel --- tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'tools/gpu/gl/glx') diff --git a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp index 066784df69..a6b2637c4b 100644 --- a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp +++ b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp @@ -107,11 +107,6 @@ GLXGLTestContext::GLXGLTestContext(GrGLStandard forcedGpuAPI, GLXGLTestContext* , fDisplay(nullptr) , fPixmap(0) , fGlxPixmap(0) { - // We cross our fingers that this is the first X call in the program and that if the application - // is actually threaded that this succeeds. - static SkOnce gOnce; - gOnce([] { XInitThreads(); }); - fDisplay = get_display(); GLXContext glxShareContext = shareContext ? shareContext->fContext : nullptr; -- cgit v1.2.3