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

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

Issue 1731333002: Revert of Include glGetMultisamplefv API (Closed) 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 | « src/gpu/GrCaps.cpp ('k') | src/gpu/gl/GrGLCaps.cpp » ('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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 GET_PROC(EnableVertexAttribArray); 155 GET_PROC(EnableVertexAttribArray);
156 GET_PROC(EndQuery); 156 GET_PROC(EndQuery);
157 GET_PROC(Finish); 157 GET_PROC(Finish);
158 GET_PROC(Flush); 158 GET_PROC(Flush);
159 GET_PROC(FrontFace); 159 GET_PROC(FrontFace);
160 GET_PROC(GenBuffers); 160 GET_PROC(GenBuffers);
161 GET_PROC(GenerateMipmap); 161 GET_PROC(GenerateMipmap);
162 GET_PROC(GetBufferParameteriv); 162 GET_PROC(GetBufferParameteriv);
163 GET_PROC(GetError); 163 GET_PROC(GetError);
164 GET_PROC(GetIntegerv); 164 GET_PROC(GetIntegerv);
165 if (glVer >= GR_GL_VER(3,2)) {
166 GET_PROC(GetMultisamplefv);
167 }
168 GET_PROC(GetQueryObjectiv); 165 GET_PROC(GetQueryObjectiv);
169 GET_PROC(GetQueryObjectuiv); 166 GET_PROC(GetQueryObjectuiv);
170 if (glVer >= GR_GL_VER(3,3) || extensions.has("GL_ARB_timer_query")) { 167 if (glVer >= GR_GL_VER(3,3) || extensions.has("GL_ARB_timer_query")) {
171 GET_PROC(GetQueryObjecti64v); 168 GET_PROC(GetQueryObjecti64v);
172 GET_PROC(GetQueryObjectui64v); 169 GET_PROC(GetQueryObjectui64v);
173 GET_PROC(QueryCounter); 170 GET_PROC(QueryCounter);
174 } else if (extensions.has("GL_EXT_timer_query")) { 171 } else if (extensions.has("GL_EXT_timer_query")) {
175 GET_PROC_SUFFIX(GetQueryObjecti64v, EXT); 172 GET_PROC_SUFFIX(GetQueryObjecti64v, EXT);
176 GET_PROC_SUFFIX(GetQueryObjectui64v, EXT); 173 GET_PROC_SUFFIX(GetQueryObjectui64v, EXT);
177 } 174 }
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 GET_PROC(Finish); 602 GET_PROC(Finish);
606 GET_PROC(Flush); 603 GET_PROC(Flush);
607 GET_PROC(FrontFace); 604 GET_PROC(FrontFace);
608 GET_PROC(GenBuffers); 605 GET_PROC(GenBuffers);
609 GET_PROC(GenerateMipmap); 606 GET_PROC(GenerateMipmap);
610 GET_PROC(GenTextures); 607 GET_PROC(GenTextures);
611 GET_PROC_SUFFIX(GenVertexArrays, OES); 608 GET_PROC_SUFFIX(GenVertexArrays, OES);
612 GET_PROC(GetBufferParameteriv); 609 GET_PROC(GetBufferParameteriv);
613 GET_PROC(GetError); 610 GET_PROC(GetError);
614 GET_PROC(GetIntegerv); 611 GET_PROC(GetIntegerv);
615
616 if (version >= GR_GL_VER(3,1)) {
617 GET_PROC(GetMultisamplefv);
618 }
619
620 GET_PROC(GetProgramInfoLog); 612 GET_PROC(GetProgramInfoLog);
621 GET_PROC(GetProgramiv); 613 GET_PROC(GetProgramiv);
622 GET_PROC(GetShaderInfoLog); 614 GET_PROC(GetShaderInfoLog);
623 GET_PROC(GetShaderPrecisionFormat); 615 GET_PROC(GetShaderPrecisionFormat);
624 GET_PROC(GetShaderiv); 616 GET_PROC(GetShaderiv);
625 GET_PROC(GetString); 617 GET_PROC(GetString);
626 GET_PROC(GetStringi); 618 GET_PROC(GetStringi);
627 GET_PROC(GetUniformLocation); 619 GET_PROC(GetUniformLocation);
628 GET_PROC(IsTexture); 620 GET_PROC(IsTexture);
629 GET_PROC(LineWidth); 621 GET_PROC(LineWidth);
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 if (extensions.has("EGL_KHR_image") || extensions.has("EGL_KHR_image_base")) { 868 if (extensions.has("EGL_KHR_image") || extensions.has("EGL_KHR_image_base")) {
877 GET_EGL_PROC_SUFFIX(CreateImage, KHR); 869 GET_EGL_PROC_SUFFIX(CreateImage, KHR);
878 GET_EGL_PROC_SUFFIX(DestroyImage, KHR); 870 GET_EGL_PROC_SUFFIX(DestroyImage, KHR);
879 } 871 }
880 872
881 interface->fStandard = kGLES_GrGLStandard; 873 interface->fStandard = kGLES_GrGLStandard;
882 interface->fExtensions.swap(&extensions); 874 interface->fExtensions.swap(&extensions);
883 875
884 return interface; 876 return interface;
885 } 877 }
OLDNEW
« no previous file with comments | « src/gpu/GrCaps.cpp ('k') | src/gpu/gl/GrGLCaps.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698