| 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));
|
| }
|
|
|
|
|