OLD | NEW |
---|---|
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/GrGLExtensions.h" | 7 #include "gl/GrGLExtensions.h" |
8 #include "gl/GrGLInterface.h" | 8 #include "gl/GrGLInterface.h" |
9 #include "gl/GrGLUtil.h" | 9 #include "gl/GrGLUtil.h" |
10 | 10 |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
140 interface->fVertexAttrib4fv = glVertexAttrib4fv; | 140 interface->fVertexAttrib4fv = glVertexAttrib4fv; |
141 interface->fVertexAttribPointer = glVertexAttribPointer; | 141 interface->fVertexAttribPointer = glVertexAttribPointer; |
142 interface->fViewport = glViewport; | 142 interface->fViewport = glViewport; |
143 interface->fBindFramebuffer = glBindFramebuffer; | 143 interface->fBindFramebuffer = glBindFramebuffer; |
144 interface->fBindRenderbuffer = glBindRenderbuffer; | 144 interface->fBindRenderbuffer = glBindRenderbuffer; |
145 interface->fCheckFramebufferStatus = glCheckFramebufferStatus; | 145 interface->fCheckFramebufferStatus = glCheckFramebufferStatus; |
146 interface->fDeleteFramebuffers = glDeleteFramebuffers; | 146 interface->fDeleteFramebuffers = glDeleteFramebuffers; |
147 interface->fDeleteRenderbuffers = glDeleteRenderbuffers; | 147 interface->fDeleteRenderbuffers = glDeleteRenderbuffers; |
148 interface->fFramebufferRenderbuffer = glFramebufferRenderbuffer; | 148 interface->fFramebufferRenderbuffer = glFramebufferRenderbuffer; |
149 interface->fFramebufferTexture2D = glFramebufferTexture2D; | 149 interface->fFramebufferTexture2D = glFramebufferTexture2D; |
150 #if GR_GL_IGNORE_ES3_MSAA | 150 |
151 if (version >= GR_GL_VER(3,0)) { | |
bsalomon
2014/01/16 19:49:58
The change here was to delete the #if GR_GL_IGNORE
| |
152 #if GL_ES_VERSION_3_0 | |
153 interface->fRenderbufferStorageMultisample = glRenderbufferStorageMultis ample; | |
154 interface->fBlitFramebuffer = glBlitFramebuffer; | |
155 #else | |
156 interface->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMul tisampleProc) eglGetProcAddress("glRenderbufferStorageMultisample"); | |
157 interface->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAddres s("glBlitFramebuffer"); | |
158 #endif | |
159 } | |
151 | 160 |
152 if (extensions.has("GL_EXT_multisampled_render_to_texture")) { | 161 if (extensions.has("GL_EXT_multisampled_render_to_texture")) { |
153 #if GL_EXT_multisampled_render_to_texture | 162 #if GL_EXT_multisampled_render_to_texture |
154 interface->fFramebufferTexture2DMultisample = glFramebufferTexture2DMult isampleEXT; | 163 interface->fFramebufferTexture2DMultisample = glFramebufferTexture2DMult isampleEXT; |
155 interface->fRenderbufferStorageMultisample = glRenderbufferStorageMultis ampleEXT; | 164 interface->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorage MultisampleEXT; |
156 #else | 165 #else |
157 interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DM ultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleEXT"); | 166 interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DM ultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleEXT"); |
158 interface->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMul tisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleEXT"); | 167 interface->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStor ageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleEXT"); |
159 #endif | 168 #endif |
160 } else if (extensions.has("GL_IMG_multisampled_render_to_texture")) { | 169 } else if (extensions.has("GL_IMG_multisampled_render_to_texture")) { |
161 #if GL_IMG_multisampled_render_to_texture | 170 #if GL_IMG_multisampled_render_to_texture |
162 interface->fFramebufferTexture2DMultisample = glFramebufferTexture2DMult isampleIMG; | 171 interface->fFramebufferTexture2DMultisample = glFramebufferTexture2DMult isampleIMG; |
163 interface->fRenderbufferStorageMultisample = glRenderbufferStorageMultis ampleIMG; | 172 interface->fRenderbufferStorageMultisampleES2EXT = glRenderbufferStorage MultisampleIMG; |
164 #else | 173 #else |
165 interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DM ultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleIMG"); | 174 interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTexture2DM ultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleIMG"); |
166 interface->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMul tisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleIMG"); | 175 interface->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbufferStor ageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleIMG"); |
167 #endif | 176 #endif |
168 } | 177 } |
169 | 178 |
170 #else // GR_GL_IGNORE_ES3_MSAA | |
171 | |
172 if (version >= GR_GL_VER(3,0)) { | |
173 #if GL_ES_VERSION_3_0 | |
174 interface->fRenderbufferStorageMultisample = glRenderbufferStorageMu ltisample; | |
175 interface->fBlitFramebuffer = glBlitFramebuffer; | |
176 #else | |
177 interface->fRenderbufferStorageMultisample = (GrGLRenderbufferStorag eMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisample"); | |
178 interface->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAd dress("glBlitFramebuffer"); | |
179 #endif | |
180 } | |
181 if (extensions.has("GL_EXT_multisampled_render_to_texture")) { | |
182 #if GL_EXT_multisampled_render_to_texture | |
183 interface->fFramebufferTexture2DMultisample = glFramebufferTexture2D MultisampleEXT; | |
184 interface->fRenderbufferStorageMultisampleES2EXT = glRenderbufferSto rageMultisampleEXT; | |
185 #else | |
186 interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTextur e2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleEXT"); | |
187 interface->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbuffer StorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleEXT") ; | |
188 #endif | |
189 } else if (extensions.has("GL_IMG_multisampled_render_to_texture")) { | |
190 #if GL_IMG_multisampled_render_to_texture | |
191 interface->fFramebufferTexture2DMultisample = glFramebufferTexture2D MultisampleIMG; | |
192 interface->fRenderbufferStorageMultisampleES2EXT = glRenderbufferSto rageMultisampleIMG; | |
193 #else | |
194 interface->fFramebufferTexture2DMultisample = (GrGLFramebufferTextur e2DMultisampleProc) eglGetProcAddress("glFramebufferTexture2DMultisampleIMG"); | |
195 interface->fRenderbufferStorageMultisampleES2EXT = (GrGLRenderbuffer StorageMultisampleProc) eglGetProcAddress("glRenderbufferStorageMultisampleIMG") ; | |
196 #endif | |
197 } | |
198 | |
199 #endif // GR_GL_IGNORE_ES3_MSAA | |
200 interface->fGenFramebuffers = glGenFramebuffers; | 179 interface->fGenFramebuffers = glGenFramebuffers; |
201 interface->fGenRenderbuffers = glGenRenderbuffers; | 180 interface->fGenRenderbuffers = glGenRenderbuffers; |
202 interface->fGetFramebufferAttachmentParameteriv = glGetFramebufferAttachment Parameteriv; | 181 interface->fGetFramebufferAttachmentParameteriv = glGetFramebufferAttachment Parameteriv; |
203 interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv; | 182 interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv; |
204 interface->fRenderbufferStorage = glRenderbufferStorage; | 183 interface->fRenderbufferStorage = glRenderbufferStorage; |
205 #if GL_OES_mapbuffer | 184 #if GL_OES_mapbuffer |
206 interface->fMapBuffer = glMapBufferOES; | 185 interface->fMapBuffer = glMapBufferOES; |
207 interface->fUnmapBuffer = glUnmapBufferOES; | 186 interface->fUnmapBuffer = glUnmapBufferOES; |
208 #else | 187 #else |
209 interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOE S"); | 188 interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOE S"); |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
425 } | 404 } |
426 | 405 |
427 if (kGLES_GrGLStandard == standard) { | 406 if (kGLES_GrGLStandard == standard) { |
428 return create_es_interface(version, extensions); | 407 return create_es_interface(version, extensions); |
429 } else if (kGL_GrGLStandard == standard) { | 408 } else if (kGL_GrGLStandard == standard) { |
430 return create_desktop_interface(version, extensions); | 409 return create_desktop_interface(version, extensions); |
431 } else { | 410 } else { |
432 return NULL; | 411 return NULL; |
433 } | 412 } |
434 } | 413 } |
OLD | NEW |