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

Side by Side Diff: src/gpu/gl/GrGLAssembleInterface.cpp

Issue 1206333003: Revert of Cleanup legacy NVPR-related definitions (Closed) Base URL: https://skia.googlesource.com/skia.git@chromium-pathrendering-prepare-02
Patch Set: Created 5 years, 5 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 | « include/gpu/gl/GrGLInterface.h ('k') | src/gpu/gl/GrGLGpu.h » ('j') | 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 /* 2 /*
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 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 "GrGLAssembleInterface.h" 10 #include "GrGLAssembleInterface.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 } else { 266 } else {
267 // we must have FBOs 267 // we must have FBOs
268 delete interface; 268 delete interface;
269 return NULL; 269 return NULL;
270 } 270 }
271 271
272 if (extensions.has("GL_NV_path_rendering")) { 272 if (extensions.has("GL_NV_path_rendering")) {
273 GET_PROC_SUFFIX(MatrixLoadf, EXT); 273 GET_PROC_SUFFIX(MatrixLoadf, EXT);
274 GET_PROC_SUFFIX(MatrixLoadIdentity, EXT); 274 GET_PROC_SUFFIX(MatrixLoadIdentity, EXT);
275 GET_PROC_SUFFIX(PathCommands, NV); 275 GET_PROC_SUFFIX(PathCommands, NV);
276 GET_PROC_SUFFIX(PathCoords, NV);
276 GET_PROC_SUFFIX(PathParameteri, NV); 277 GET_PROC_SUFFIX(PathParameteri, NV);
277 GET_PROC_SUFFIX(PathParameterf, NV); 278 GET_PROC_SUFFIX(PathParameterf, NV);
278 GET_PROC_SUFFIX(GenPaths, NV); 279 GET_PROC_SUFFIX(GenPaths, NV);
279 GET_PROC_SUFFIX(DeletePaths, NV); 280 GET_PROC_SUFFIX(DeletePaths, NV);
280 GET_PROC_SUFFIX(IsPath, NV); 281 GET_PROC_SUFFIX(IsPath, NV);
281 GET_PROC_SUFFIX(PathStencilFunc, NV); 282 GET_PROC_SUFFIX(PathStencilFunc, NV);
282 GET_PROC_SUFFIX(StencilFillPath, NV); 283 GET_PROC_SUFFIX(StencilFillPath, NV);
283 GET_PROC_SUFFIX(StencilStrokePath, NV); 284 GET_PROC_SUFFIX(StencilStrokePath, NV);
284 GET_PROC_SUFFIX(StencilFillPathInstanced, NV); 285 GET_PROC_SUFFIX(StencilFillPathInstanced, NV);
285 GET_PROC_SUFFIX(StencilStrokePathInstanced, NV); 286 GET_PROC_SUFFIX(StencilStrokePathInstanced, NV);
287 GET_PROC_SUFFIX(PathTexGen, NV);
286 GET_PROC_SUFFIX(CoverFillPath, NV); 288 GET_PROC_SUFFIX(CoverFillPath, NV);
287 GET_PROC_SUFFIX(CoverStrokePath, NV); 289 GET_PROC_SUFFIX(CoverStrokePath, NV);
288 GET_PROC_SUFFIX(CoverFillPathInstanced, NV); 290 GET_PROC_SUFFIX(CoverFillPathInstanced, NV);
289 GET_PROC_SUFFIX(CoverStrokePathInstanced, NV); 291 GET_PROC_SUFFIX(CoverStrokePathInstanced, NV);
292 // NV_path_rendering v1.2 (These methods may not be present)
290 GET_PROC_SUFFIX(StencilThenCoverFillPath, NV); 293 GET_PROC_SUFFIX(StencilThenCoverFillPath, NV);
291 GET_PROC_SUFFIX(StencilThenCoverStrokePath, NV); 294 GET_PROC_SUFFIX(StencilThenCoverStrokePath, NV);
292 GET_PROC_SUFFIX(StencilThenCoverFillPathInstanced, NV); 295 GET_PROC_SUFFIX(StencilThenCoverFillPathInstanced, NV);
293 GET_PROC_SUFFIX(StencilThenCoverStrokePathInstanced, NV); 296 GET_PROC_SUFFIX(StencilThenCoverStrokePathInstanced, NV);
297 // NV_path_rendering v1.3 (These methods may not be present)
294 GET_PROC_SUFFIX(ProgramPathFragmentInputGen, NV); 298 GET_PROC_SUFFIX(ProgramPathFragmentInputGen, NV);
295 } 299 }
296 300
297 if (extensions.has("GL_NV_framebuffer_mixed_samples")) { 301 if (extensions.has("GL_NV_framebuffer_mixed_samples")) {
298 GET_PROC_SUFFIX(CoverageModulation, NV); 302 GET_PROC_SUFFIX(CoverageModulation, NV);
299 } 303 }
300 304
301 if (extensions.has("GL_EXT_debug_marker")) { 305 if (extensions.has("GL_EXT_debug_marker")) {
302 GET_PROC_SUFFIX(InsertEventMarker, EXT); 306 GET_PROC_SUFFIX(InsertEventMarker, EXT);
303 GET_PROC_SUFFIX(PushGroupMarker, EXT); 307 GET_PROC_SUFFIX(PushGroupMarker, EXT);
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 GET_PROC(InvalidateTexSubImage); 675 GET_PROC(InvalidateTexSubImage);
672 676
673 if (version >= GR_GL_VER(3,1)) { 677 if (version >= GR_GL_VER(3,1)) {
674 GET_PROC(GetProgramResourceLocation); 678 GET_PROC(GetProgramResourceLocation);
675 } 679 }
676 680
677 if (extensions.has("GL_NV_path_rendering")) { 681 if (extensions.has("GL_NV_path_rendering")) {
678 GET_PROC_SUFFIX(MatrixLoadf, EXT); 682 GET_PROC_SUFFIX(MatrixLoadf, EXT);
679 GET_PROC_SUFFIX(MatrixLoadIdentity, EXT); 683 GET_PROC_SUFFIX(MatrixLoadIdentity, EXT);
680 GET_PROC_SUFFIX(PathCommands, NV); 684 GET_PROC_SUFFIX(PathCommands, NV);
685 GET_PROC_SUFFIX(PathCoords, NV);
681 GET_PROC_SUFFIX(PathParameteri, NV); 686 GET_PROC_SUFFIX(PathParameteri, NV);
682 GET_PROC_SUFFIX(PathParameterf, NV); 687 GET_PROC_SUFFIX(PathParameterf, NV);
683 GET_PROC_SUFFIX(GenPaths, NV); 688 GET_PROC_SUFFIX(GenPaths, NV);
684 GET_PROC_SUFFIX(DeletePaths, NV); 689 GET_PROC_SUFFIX(DeletePaths, NV);
685 GET_PROC_SUFFIX(IsPath, NV); 690 GET_PROC_SUFFIX(IsPath, NV);
686 GET_PROC_SUFFIX(PathStencilFunc, NV); 691 GET_PROC_SUFFIX(PathStencilFunc, NV);
687 GET_PROC_SUFFIX(StencilFillPath, NV); 692 GET_PROC_SUFFIX(StencilFillPath, NV);
688 GET_PROC_SUFFIX(StencilStrokePath, NV); 693 GET_PROC_SUFFIX(StencilStrokePath, NV);
689 GET_PROC_SUFFIX(StencilFillPathInstanced, NV); 694 GET_PROC_SUFFIX(StencilFillPathInstanced, NV);
690 GET_PROC_SUFFIX(StencilStrokePathInstanced, NV); 695 GET_PROC_SUFFIX(StencilStrokePathInstanced, NV);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 GET_PROC_SUFFIX(PushDebugGroup, KHR); 741 GET_PROC_SUFFIX(PushDebugGroup, KHR);
737 GET_PROC_SUFFIX(PopDebugGroup, KHR); 742 GET_PROC_SUFFIX(PopDebugGroup, KHR);
738 GET_PROC_SUFFIX(ObjectLabel, KHR); 743 GET_PROC_SUFFIX(ObjectLabel, KHR);
739 } 744 }
740 745
741 interface->fStandard = kGLES_GrGLStandard; 746 interface->fStandard = kGLES_GrGLStandard;
742 interface->fExtensions.swap(&extensions); 747 interface->fExtensions.swap(&extensions);
743 748
744 return interface; 749 return interface;
745 } 750 }
OLDNEW
« no previous file with comments | « include/gpu/gl/GrGLInterface.h ('k') | src/gpu/gl/GrGLGpu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698