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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 8
9 #include "gl/GrGLInterface.h" 9 #include "gl/GrGLInterface.h"
10 #include "gl/GrGLAssembleInterface.h" 10 #include "gl/GrGLAssembleInterface.h"
11 #include "gl/GrGLUtil.h" 11 #include "gl/GrGLUtil.h"
12 12 #include <string>
13 #include <GL/glx.h> 13 #include <GL/glx.h>
14 14
15 static GrGLFuncPtr glx_get(void* ctx, const char name[]) { 15 static GrGLFuncPtr glx_get(void* ctx, const char name[]) {
16 SkASSERT(nullptr == ctx); 16 SkASSERT(nullptr == ctx);
17 SkASSERT(glXGetCurrentContext()); 17 SkASSERT(glXGetCurrentContext());
18 const char *strP = strstr(name, "egl");
19 if(strP && strP == name) { //return 0 for egl functions in glx context
20 return nullptr;
21 }
18 return glXGetProcAddress(reinterpret_cast<const GLubyte*>(name)); 22 return glXGetProcAddress(reinterpret_cast<const GLubyte*>(name));
19 } 23 }
20 24
21 const GrGLInterface* GrGLCreateNativeInterface() { 25 const GrGLInterface* GrGLCreateNativeInterface() {
22 if (nullptr == glXGetCurrentContext()) { 26 if (nullptr == glXGetCurrentContext()) {
23 return nullptr; 27 return nullptr;
24 } 28 }
25 29
26 return GrGLAssembleInterface(nullptr, glx_get); 30 return GrGLAssembleInterface(nullptr, glx_get);
27 } 31 }
OLDNEW
« 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