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

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

Issue 23513006: Add glTexGen funcs to interface (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: mesa Created 7 years, 3 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" 10 #include "gl/GrGLExtensions.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 extensions.has("GL_ARB_imaging") || 56 extensions.has("GL_ARB_imaging") ||
57 extensions.has("GL_EXT_blend_color")) { 57 extensions.has("GL_EXT_blend_color")) {
58 GR_GL_GET_PROC(BlendColor); 58 GR_GL_GET_PROC(BlendColor);
59 } 59 }
60 60
61 GR_GL_GET_PROC(BufferData); 61 GR_GL_GET_PROC(BufferData);
62 GR_GL_GET_PROC(BufferSubData); 62 GR_GL_GET_PROC(BufferSubData);
63 interface->fClear = glClear; 63 interface->fClear = glClear;
64 interface->fClearColor = glClearColor; 64 interface->fClearColor = glClearColor;
65 interface->fClearStencil = glClearStencil; 65 interface->fClearStencil = glClearStencil;
66 interface->fClientActiveTexture = glClientActiveTexture;
66 interface->fColorMask = glColorMask; 67 interface->fColorMask = glColorMask;
67 GR_GL_GET_PROC(CompileShader); 68 GR_GL_GET_PROC(CompileShader);
68 interface->fCompressedTexImage2D = glCompressedTexImage2D; 69 interface->fCompressedTexImage2D = glCompressedTexImage2D;
69 interface->fCopyTexSubImage2D = glCopyTexSubImage2D; 70 interface->fCopyTexSubImage2D = glCopyTexSubImage2D;
70 GR_GL_GET_PROC(CreateProgram); 71 GR_GL_GET_PROC(CreateProgram);
71 GR_GL_GET_PROC(CreateShader); 72 GR_GL_GET_PROC(CreateShader);
72 interface->fCullFace = glCullFace; 73 interface->fCullFace = glCullFace;
73 GR_GL_GET_PROC(DeleteBuffers); 74 GR_GL_GET_PROC(DeleteBuffers);
74 GR_GL_GET_PROC(DeleteProgram); 75 GR_GL_GET_PROC(DeleteProgram);
75 GR_GL_GET_PROC(DeleteQueries); 76 GR_GL_GET_PROC(DeleteQueries);
76 GR_GL_GET_PROC(DeleteShader); 77 GR_GL_GET_PROC(DeleteShader);
77 interface->fDeleteTextures = glDeleteTextures; 78 interface->fDeleteTextures = glDeleteTextures;
78 interface->fDepthMask = glDepthMask; 79 interface->fDepthMask = glDepthMask;
79 interface->fDisable = glDisable; 80 interface->fDisable = glDisable;
81 interface->fDisableClientState = glDisableClientState;
80 GR_GL_GET_PROC(DisableVertexAttribArray); 82 GR_GL_GET_PROC(DisableVertexAttribArray);
81 interface->fDrawArrays = glDrawArrays; 83 interface->fDrawArrays = glDrawArrays;
82 interface->fDrawBuffer = glDrawBuffer; 84 interface->fDrawBuffer = glDrawBuffer;
83 GR_GL_GET_PROC(DrawBuffers); 85 GR_GL_GET_PROC(DrawBuffers);
84 interface->fDrawElements = glDrawElements; 86 interface->fDrawElements = glDrawElements;
85 interface->fEnable = glEnable; 87 interface->fEnable = glEnable;
88 interface->fEnableClientState = glEnableClientState;
86 GR_GL_GET_PROC(EnableVertexAttribArray); 89 GR_GL_GET_PROC(EnableVertexAttribArray);
87 GR_GL_GET_PROC(EndQuery); 90 GR_GL_GET_PROC(EndQuery);
88 interface->fFinish = glFinish; 91 interface->fFinish = glFinish;
89 interface->fFlush = glFlush; 92 interface->fFlush = glFlush;
90 interface->fFrontFace = glFrontFace; 93 interface->fFrontFace = glFrontFace;
91 GR_GL_GET_PROC(GenBuffers); 94 GR_GL_GET_PROC(GenBuffers);
92 GR_GL_GET_PROC(GenerateMipmap); 95 GR_GL_GET_PROC(GenerateMipmap);
93 GR_GL_GET_PROC(GetBufferParameteriv); 96 GR_GL_GET_PROC(GetBufferParameteriv);
94 interface->fGetError = glGetError; 97 interface->fGetError = glGetError;
95 interface->fGetIntegerv = glGetIntegerv; 98 interface->fGetIntegerv = glGetIntegerv;
(...skipping 29 matching lines...) Expand all
125 } 128 }
126 interface->fScissor = glScissor; 129 interface->fScissor = glScissor;
127 GR_GL_GET_PROC(ShaderSource); 130 GR_GL_GET_PROC(ShaderSource);
128 interface->fStencilFunc = glStencilFunc; 131 interface->fStencilFunc = glStencilFunc;
129 GR_GL_GET_PROC(StencilFuncSeparate); 132 GR_GL_GET_PROC(StencilFuncSeparate);
130 interface->fStencilMask = glStencilMask; 133 interface->fStencilMask = glStencilMask;
131 GR_GL_GET_PROC(StencilMaskSeparate); 134 GR_GL_GET_PROC(StencilMaskSeparate);
132 interface->fStencilOp = glStencilOp; 135 interface->fStencilOp = glStencilOp;
133 GR_GL_GET_PROC(StencilOpSeparate); 136 GR_GL_GET_PROC(StencilOpSeparate);
134 interface->fTexImage2D = glTexImage2D; 137 interface->fTexImage2D = glTexImage2D;
138 interface->fTexGenf = glTexGenf;
139 interface->fTexGenfv = glTexGenfv;
140 interface->fTexGeni = glTexGeni;
135 interface->fTexParameteri = glTexParameteri; 141 interface->fTexParameteri = glTexParameteri;
136 interface->fTexParameteriv = glTexParameteriv; 142 interface->fTexParameteriv = glTexParameteriv;
137 if (glVer >= GR_GL_VER(4,2) || extensions.has("GL_ARB_texture_storage")) { 143 if (glVer >= GR_GL_VER(4,2) || extensions.has("GL_ARB_texture_storage")) {
138 GR_GL_GET_PROC(TexStorage2D); 144 GR_GL_GET_PROC(TexStorage2D);
139 } else if (extensions.has("GL_EXT_texture_storage")) { 145 } else if (extensions.has("GL_EXT_texture_storage")) {
140 GR_GL_GET_PROC_SUFFIX(TexStorage2D, EXT); 146 GR_GL_GET_PROC_SUFFIX(TexStorage2D, EXT);
141 } 147 }
142 interface->fTexSubImage2D = glTexSubImage2D; 148 interface->fTexSubImage2D = glTexSubImage2D;
143 GR_GL_GET_PROC(Uniform1f); 149 GR_GL_GET_PROC(Uniform1f);
144 GR_GL_GET_PROC(Uniform1i); 150 GR_GL_GET_PROC(Uniform1i);
(...skipping 11 matching lines...) Expand all
156 GR_GL_GET_PROC(Uniform4i); 162 GR_GL_GET_PROC(Uniform4i);
157 GR_GL_GET_PROC(Uniform4fv); 163 GR_GL_GET_PROC(Uniform4fv);
158 GR_GL_GET_PROC(Uniform4iv); 164 GR_GL_GET_PROC(Uniform4iv);
159 GR_GL_GET_PROC(UniformMatrix2fv); 165 GR_GL_GET_PROC(UniformMatrix2fv);
160 GR_GL_GET_PROC(UniformMatrix3fv); 166 GR_GL_GET_PROC(UniformMatrix3fv);
161 GR_GL_GET_PROC(UniformMatrix4fv); 167 GR_GL_GET_PROC(UniformMatrix4fv);
162 GR_GL_GET_PROC(UnmapBuffer); 168 GR_GL_GET_PROC(UnmapBuffer);
163 GR_GL_GET_PROC(UseProgram); 169 GR_GL_GET_PROC(UseProgram);
164 GR_GL_GET_PROC(VertexAttrib4fv); 170 GR_GL_GET_PROC(VertexAttrib4fv);
165 GR_GL_GET_PROC(VertexAttribPointer); 171 GR_GL_GET_PROC(VertexAttribPointer);
172 GR_GL_GET_PROC(VertexPointer);
166 interface->fViewport = glViewport; 173 interface->fViewport = glViewport;
167 GR_GL_GET_PROC(BindFragDataLocationIndexed); 174 GR_GL_GET_PROC(BindFragDataLocationIndexed);
168 175
169 if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_objec t")) { 176 if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_objec t")) {
170 // no ARB suffix for GL_ARB_vertex_array_object 177 // no ARB suffix for GL_ARB_vertex_array_object
171 GR_GL_GET_PROC(BindVertexArray); 178 GR_GL_GET_PROC(BindVertexArray);
172 GR_GL_GET_PROC(GenVertexArrays); 179 GR_GL_GET_PROC(GenVertexArrays);
173 GR_GL_GET_PROC(DeleteVertexArrays); 180 GR_GL_GET_PROC(DeleteVertexArrays);
174 } 181 }
175 182
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 GR_GL_GET_PROC_SUFFIX(PointAlongPath, NV); 278 GR_GL_GET_PROC_SUFFIX(PointAlongPath, NV);
272 } 279 }
273 280
274 interface->fBindingsExported = kDesktop_GrGLBinding; 281 interface->fBindingsExported = kDesktop_GrGLBinding;
275 282
276 return interface; 283 return interface;
277 } else { 284 } else {
278 return NULL; 285 return NULL;
279 } 286 }
280 } 287 }
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