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

Side by Side Diff: src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp

Issue 140823003: Move GrGLExtensions from GrGLContextInfo to GrGLInterface (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Fix Android Created 6 years, 11 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 | Annotate | Revision Log
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "gl/GrGLExtensions.h"
11 #include "gl/GrGLInterface.h" 10 #include "gl/GrGLInterface.h"
12 #include "../GrGLUtil.h" 11 #include "../GrGLUtil.h"
13 12
14 #include <GL/glx.h> 13 #include <GL/glx.h>
15 #include <GL/gl.h> 14 #include <GL/gl.h>
16 #include <GL/glext.h> 15 #include <GL/glext.h>
17 #include <GL/glu.h> 16 #include <GL/glu.h>
18 17
19 #define GR_GL_GET_PROC(F) interface->f ## F = (GrGL ## F ## Proc) \ 18 #define GR_GL_GET_PROC(F) interface->f ## F = (GrGL ## F ## Proc) \
20 glXGetProcAddress(reinterpret_cast<const GLubyte*>("gl" #F)); 19 glXGetProcAddress(reinterpret_cast<const GLubyte*>("gl" #F));
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 GR_GL_GET_PROC_SUFFIX(GetPathColorGenfv, NV); 268 GR_GL_GET_PROC_SUFFIX(GetPathColorGenfv, NV);
270 GR_GL_GET_PROC_SUFFIX(GetPathTexGeniv, NV); 269 GR_GL_GET_PROC_SUFFIX(GetPathTexGeniv, NV);
271 GR_GL_GET_PROC_SUFFIX(GetPathTexGenfv, NV); 270 GR_GL_GET_PROC_SUFFIX(GetPathTexGenfv, NV);
272 GR_GL_GET_PROC_SUFFIX(IsPointInFillPath, NV); 271 GR_GL_GET_PROC_SUFFIX(IsPointInFillPath, NV);
273 GR_GL_GET_PROC_SUFFIX(IsPointInStrokePath, NV); 272 GR_GL_GET_PROC_SUFFIX(IsPointInStrokePath, NV);
274 GR_GL_GET_PROC_SUFFIX(GetPathLength, NV); 273 GR_GL_GET_PROC_SUFFIX(GetPathLength, NV);
275 GR_GL_GET_PROC_SUFFIX(PointAlongPath, NV); 274 GR_GL_GET_PROC_SUFFIX(PointAlongPath, NV);
276 } 275 }
277 276
278 interface->fStandard = kGL_GrGLStandard; 277 interface->fStandard = kGL_GrGLStandard;
278 interface->fExtensions.swap(&extensions);
279 279
280 return interface; 280 return interface;
281 } else { 281 } else {
282 return NULL; 282 return NULL;
283 } 283 }
284 } 284 }
OLDNEW
« no previous file with comments | « src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp ('k') | src/gpu/gl/win/GrGLCreateNativeInterface_win.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698