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

Side by Side Diff: src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp

Issue 12390021: Move the default definition of GR_USE_NEW_SHADER_SOURCE_SIGNATURE to GrGLConfig. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 9 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
« no previous file with comments | « src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp ('k') | 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 /* 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/GrGLInterface.h" 10 #include "gl/GrGLInterface.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 interface->fGenTextures = glGenTextures; 108 interface->fGenTextures = glGenTextures;
109 interface->fGetUniformLocation = glGetUniformLocation; 109 interface->fGetUniformLocation = glGetUniformLocation;
110 interface->fLineWidth = glLineWidth; 110 interface->fLineWidth = glLineWidth;
111 interface->fLinkProgram = glLinkProgram; 111 interface->fLinkProgram = glLinkProgram;
112 interface->fMapBuffer = glMapBuffer; 112 interface->fMapBuffer = glMapBuffer;
113 interface->fPixelStorei = glPixelStorei; 113 interface->fPixelStorei = glPixelStorei;
114 interface->fReadBuffer = glReadBuffer; 114 interface->fReadBuffer = glReadBuffer;
115 interface->fReadPixels = glReadPixels; 115 interface->fReadPixels = glReadPixels;
116 interface->fScissor = glScissor; 116 interface->fScissor = glScissor;
117 // The new OpenGLES2 header has an extra "const" in it. :( 117 // The new OpenGLES2 header has an extra "const" in it. :(
118 #if GR_USE_NEW_GL_SHADER_SOURCE_SIGNATURE 118 #if GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE
119 interface->fShaderSource = (GrGLShaderSourceProc) glShaderSource; 119 interface->fShaderSource = (GrGLShaderSourceProc) glShaderSource;
120 #else 120 #else
121 interface->fShaderSource = glShaderSource; 121 interface->fShaderSource = glShaderSource;
122 #endif 122 #endif
123 interface->fStencilFunc = glStencilFunc; 123 interface->fStencilFunc = glStencilFunc;
124 interface->fStencilFuncSeparate = glStencilFuncSeparate; 124 interface->fStencilFuncSeparate = glStencilFuncSeparate;
125 interface->fStencilMask = glStencilMask; 125 interface->fStencilMask = glStencilMask;
126 interface->fStencilMaskSeparate = glStencilMaskSeparate; 126 interface->fStencilMaskSeparate = glStencilMaskSeparate;
127 interface->fStencilOp = glStencilOp; 127 interface->fStencilOp = glStencilOp;
128 interface->fStencilOpSeparate = glStencilOpSeparate; 128 interface->fStencilOpSeparate = glStencilOpSeparate;
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 #if GL_VERSION_3_3 || GL_ARB_blend_func_extended 273 #if GL_VERSION_3_3 || GL_ARB_blend_func_extended
274 interface->fBindFragDataLocationIndexed = glBindFragDataLocation Indexed; 274 interface->fBindFragDataLocationIndexed = glBindFragDataLocation Indexed;
275 #else 275 #else
276 interface->fBindFragDataLocationIndexed = GET_PROC(BindFragDataL ocationIndexed); 276 interface->fBindFragDataLocationIndexed = GET_PROC(BindFragDataL ocationIndexed);
277 #endif 277 #endif
278 } 278 }
279 } 279 }
280 glInterface.get()->ref(); 280 glInterface.get()->ref();
281 return glInterface.get(); 281 return glInterface.get();
282 } 282 }
OLDNEW
« no previous file with comments | « src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698