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

Unified Diff: src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp

Issue 1707283002: fix for glXGetProcAddress of egl functions in glx context Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp
diff --git a/src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp b/src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp
index e3d37bd80f1efeeab81da681bab29797e4cd186c..dbe6e70d9101fe04592640d5e0759943a622659d 100644
--- a/src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp
+++ b/src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp
@@ -9,12 +9,16 @@
#include "gl/GrGLInterface.h"
#include "gl/GrGLAssembleInterface.h"
#include "gl/GrGLUtil.h"
-
+#include <string>
#include <GL/glx.h>
static GrGLFuncPtr glx_get(void* ctx, const char name[]) {
SkASSERT(nullptr == ctx);
SkASSERT(glXGetCurrentContext());
+ const char *strP = strstr(name, "egl");
+ if(strP && strP == name) { //return 0 for egl functions in glx context
+ return nullptr;
+ }
return glXGetProcAddress(reinterpret_cast<const GLubyte*>(name));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698