aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-11-19 13:20:13 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-11-19 18:55:18 +0000
commitcbcb0a12ad0068b820c28178e8aa141166febd1f (patch)
tree120917b5961b8a043894b95811eec1f8f6379b25 /tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
parentb07b06e14819c7bfb9da87dd754aca1239045af4 (diff)
Revert "Revert "Add Atlas Text interface for rendering SDF glyphs.""
This reverts commit 9c2202ffc22b4293b48a4edeafa1b5d2bab8bb83. Bug: skia: Change-Id: I482ddf74f8e40d3d0908c840ba5c6ff981ccefbd Reviewed-on: https://skia-review.googlesource.com/73345 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp')
-rw-r--r--tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
index a6b2637c4b..066784df69 100644
--- a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
+++ b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
@@ -107,6 +107,11 @@ 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;