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

Side by Side Diff: src/gpu/gl/android/GrGLCreateNativeInterface_android.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/GrGLNoOpInterface.cpp ('k') | src/gpu/gl/mac/GrGLCreateNativeInterface_mac.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 // Modified from chromium/src/webkit/glue/gl_bindings_skia_cmd_buffer.cc 1 // Modified from chromium/src/webkit/glue/gl_bindings_skia_cmd_buffer.cc
2 2
3 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 3 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
4 // Use of this source code is governed by a BSD-style license that can be 4 // Use of this source code is governed by a BSD-style license that can be
5 // found in the LICENSE file. 5 // found in the LICENSE file.
6 6
7 #include "gl/GrGLInterface.h" 7 #include "gl/GrGLInterface.h"
8 8
9 #ifndef GL_GLEXT_PROTOTYPES 9 #ifndef GL_GLEXT_PROTOTYPES
10 #define GL_GLEXT_PROTOTYPES 10 #define GL_GLEXT_PROTOTYPES
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 interface->fGetProgramiv = glGetProgramiv; 62 interface->fGetProgramiv = glGetProgramiv;
63 interface->fGetShaderInfoLog = glGetShaderInfoLog; 63 interface->fGetShaderInfoLog = glGetShaderInfoLog;
64 interface->fGetShaderiv = glGetShaderiv; 64 interface->fGetShaderiv = glGetShaderiv;
65 interface->fGetString = glGetString; 65 interface->fGetString = glGetString;
66 interface->fGetUniformLocation = glGetUniformLocation; 66 interface->fGetUniformLocation = glGetUniformLocation;
67 interface->fLineWidth = glLineWidth; 67 interface->fLineWidth = glLineWidth;
68 interface->fLinkProgram = glLinkProgram; 68 interface->fLinkProgram = glLinkProgram;
69 interface->fPixelStorei = glPixelStorei; 69 interface->fPixelStorei = glPixelStorei;
70 interface->fReadPixels = glReadPixels; 70 interface->fReadPixels = glReadPixels;
71 interface->fScissor = glScissor; 71 interface->fScissor = glScissor;
72 #if GR_USE_NEW_GL_SHADER_SOURCE_SIGNATURE 72 #if GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE
73 interface->fShaderSource = (GrGLShaderSourceProc) glShaderSource; 73 interface->fShaderSource = (GrGLShaderSourceProc) glShaderSource;
74 #else 74 #else
75 interface->fShaderSource = glShaderSource; 75 interface->fShaderSource = glShaderSource;
76 #endif 76 #endif
77 interface->fStencilFunc = glStencilFunc; 77 interface->fStencilFunc = glStencilFunc;
78 interface->fStencilFuncSeparate = glStencilFuncSeparate; 78 interface->fStencilFuncSeparate = glStencilFuncSeparate;
79 interface->fStencilMask = glStencilMask; 79 interface->fStencilMask = glStencilMask;
80 interface->fStencilMaskSeparate = glStencilMaskSeparate; 80 interface->fStencilMaskSeparate = glStencilMaskSeparate;
81 interface->fStencilOp = glStencilOp; 81 interface->fStencilOp = glStencilOp;
82 interface->fStencilOpSeparate = glStencilOpSeparate; 82 interface->fStencilOpSeparate = glStencilOpSeparate;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 interface->fMapBuffer = glMapBufferOES; 130 interface->fMapBuffer = glMapBufferOES;
131 interface->fUnmapBuffer = glUnmapBufferOES; 131 interface->fUnmapBuffer = glUnmapBufferOES;
132 #else 132 #else
133 interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBuff erOES"); 133 interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBuff erOES");
134 interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnm apBufferOES"); 134 interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnm apBufferOES");
135 #endif 135 #endif
136 } 136 }
137 glInterface.get()->ref(); 137 glInterface.get()->ref();
138 return glInterface.get(); 138 return glInterface.get();
139 } 139 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLNoOpInterface.cpp ('k') | src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698