OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" | 5 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" |
6 | 6 |
7 #include <GLES2/gl2.h> | 7 #include <GLES2/gl2.h> |
8 #ifndef GL_GLEXT_PROTOTYPES | 8 #ifndef GL_GLEXT_PROTOTYPES |
9 #define GL_GLEXT_PROTOTYPES 1 | 9 #define GL_GLEXT_PROTOTYPES 1 |
10 #endif | 10 #endif |
11 #include <GLES2/gl2ext.h> | 11 #include <GLES2/gl2ext.h> |
12 #include <GLES2/gl2extchromium.h> | 12 #include <GLES2/gl2extchromium.h> |
13 | 13 |
14 #include <algorithm> | 14 #include <algorithm> |
15 #include <set> | 15 #include <set> |
16 #include <string> | 16 #include <string> |
17 | 17 |
18 #include "base/bind.h" | 18 #include "base/bind.h" |
19 #include "base/bind_helpers.h" | 19 #include "base/bind_helpers.h" |
20 #include "base/callback.h" | 20 #include "base/callback.h" |
21 #include "base/command_line.h" | 21 #include "base/command_line.h" |
22 #include "base/lazy_instance.h" | 22 #include "base/lazy_instance.h" |
23 #include "base/logging.h" | 23 #include "base/logging.h" |
24 #include "base/memory/singleton.h" | 24 #include "base/memory/singleton.h" |
25 #include "base/message_loop.h" | 25 #include "base/message_loop.h" |
26 #include "base/metrics/histogram.h" | 26 #include "base/metrics/histogram.h" |
27 #include "base/synchronization/lock.h" | 27 #include "base/synchronization/lock.h" |
28 #include "gpu/command_buffer/client/gles2_implementation.h" | 28 #include "gpu/command_buffer/client/gles2_implementation.h" |
29 #include "gpu/command_buffer/client/gles2_lib.h" | 29 #include "gpu/command_buffer/client/gles2_lib.h" |
30 #include "gpu/command_buffer/client/gpu_memory_buffer_factory.h" | |
31 #include "gpu/command_buffer/client/image_factory.h" | |
30 #include "gpu/command_buffer/client/transfer_buffer.h" | 32 #include "gpu/command_buffer/client/transfer_buffer.h" |
31 #include "gpu/command_buffer/common/constants.h" | 33 #include "gpu/command_buffer/common/constants.h" |
32 #include "gpu/command_buffer/service/command_buffer_service.h" | 34 #include "gpu/command_buffer/service/command_buffer_service.h" |
33 #include "gpu/command_buffer/service/context_group.h" | 35 #include "gpu/command_buffer/service/context_group.h" |
34 #include "gpu/command_buffer/service/gl_context_virtual.h" | 36 #include "gpu/command_buffer/service/gl_context_virtual.h" |
35 #include "gpu/command_buffer/service/gpu_scheduler.h" | 37 #include "gpu/command_buffer/service/gpu_scheduler.h" |
38 #include "gpu/command_buffer/service/image_manager.h" | |
36 #include "gpu/command_buffer/service/transfer_buffer_manager.h" | 39 #include "gpu/command_buffer/service/transfer_buffer_manager.h" |
37 #include "ui/gl/gl_context.h" | 40 #include "ui/gl/gl_context.h" |
41 #include "ui/gl/gl_image.h" | |
38 #include "ui/gl/gl_share_group.h" | 42 #include "ui/gl/gl_share_group.h" |
39 #include "ui/gl/gl_surface.h" | 43 #include "ui/gl/gl_surface.h" |
40 #include "webkit/gpu/gl_bindings_skia_cmd_buffer.h" | 44 #include "webkit/gpu/gl_bindings_skia_cmd_buffer.h" |
41 | 45 |
42 using gpu::Buffer; | 46 using gpu::Buffer; |
43 using gpu::CommandBuffer; | 47 using gpu::CommandBuffer; |
44 using gpu::CommandBufferService; | 48 using gpu::CommandBufferService; |
45 using gpu::gles2::GLES2CmdHelper; | 49 using gpu::gles2::GLES2CmdHelper; |
46 using gpu::gles2::GLES2Implementation; | 50 using gpu::gles2::GLES2Implementation; |
51 using gpu::gles2::ImageFactory; | |
52 using gpu::gles2::ImageManager; | |
53 using gpu::GpuMemoryBuffer; | |
47 using gpu::GpuScheduler; | 54 using gpu::GpuScheduler; |
48 using gpu::TransferBuffer; | 55 using gpu::TransferBuffer; |
49 using gpu::TransferBufferManager; | 56 using gpu::TransferBufferManager; |
50 using gpu::TransferBufferManagerInterface; | 57 using gpu::TransferBufferManagerInterface; |
51 | 58 |
52 namespace webkit { | 59 namespace webkit { |
53 namespace gpu { | 60 namespace gpu { |
61 namespace { | |
62 class ImageFactoryInProcess; | |
63 } | |
54 | 64 |
55 class GLInProcessContext { | 65 class GLInProcessContext { |
56 public: | 66 public: |
57 // These are the same error codes as used by EGL. | 67 // These are the same error codes as used by EGL. |
58 enum Error { | 68 enum Error { |
59 SUCCESS = 0x3000, | 69 SUCCESS = 0x3000, |
60 NOT_INITIALIZED = 0x3001, | 70 NOT_INITIALIZED = 0x3001, |
61 BAD_ATTRIBUTE = 0x3004, | 71 BAD_ATTRIBUTE = 0x3004, |
62 BAD_GLContext = 0x3006, | 72 BAD_GLContext = 0x3006, |
63 CONTEXT_LOST = 0x300E | 73 CONTEXT_LOST = 0x300E |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
155 bool Initialize(bool is_offscreen, | 165 bool Initialize(bool is_offscreen, |
156 gfx::AcceleratedWidget window, | 166 gfx::AcceleratedWidget window, |
157 const gfx::Size& size, | 167 const gfx::Size& size, |
158 const char* allowed_extensions, | 168 const char* allowed_extensions, |
159 const int32* attrib_list, | 169 const int32* attrib_list, |
160 gfx::GpuPreference gpu_preference); | 170 gfx::GpuPreference gpu_preference); |
161 void Destroy(); | 171 void Destroy(); |
162 | 172 |
163 void OnContextLost(); | 173 void OnContextLost(); |
164 | 174 |
175 ::gpu::gles2::ImageManager* GetImageManager(); | |
176 | |
177 scoped_refptr<ImageFactoryInProcess> GetImageFactory(); | |
178 | |
165 base::Closure context_lost_callback_; | 179 base::Closure context_lost_callback_; |
166 scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_; | 180 scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_; |
167 scoped_ptr<CommandBufferService> command_buffer_; | 181 scoped_ptr<CommandBufferService> command_buffer_; |
168 scoped_ptr< ::gpu::GpuScheduler> gpu_scheduler_; | 182 scoped_ptr< ::gpu::GpuScheduler> gpu_scheduler_; |
169 scoped_ptr< ::gpu::gles2::GLES2Decoder> decoder_; | 183 scoped_ptr< ::gpu::gles2::GLES2Decoder> decoder_; |
170 scoped_refptr<gfx::GLContext> context_; | 184 scoped_refptr<gfx::GLContext> context_; |
171 scoped_refptr<gfx::GLSurface> surface_; | 185 scoped_refptr<gfx::GLSurface> surface_; |
172 scoped_ptr<GLES2CmdHelper> gles2_helper_; | 186 scoped_ptr<GLES2CmdHelper> gles2_helper_; |
173 scoped_ptr<TransferBuffer> transfer_buffer_; | 187 scoped_ptr<TransferBuffer> transfer_buffer_; |
174 scoped_ptr<GLES2Implementation> gles2_implementation_; | 188 scoped_ptr<GLES2Implementation> gles2_implementation_; |
189 scoped_refptr<ImageFactoryInProcess> image_factory_; | |
175 scoped_ptr<WebKit::WebGraphicsContext3D::WebGraphicsSyncPointCallback> | 190 scoped_ptr<WebKit::WebGraphicsContext3D::WebGraphicsSyncPointCallback> |
176 signal_sync_point_callback_; | 191 signal_sync_point_callback_; |
177 Error last_error_; | 192 Error last_error_; |
178 bool share_resources_; | 193 bool share_resources_; |
179 bool context_lost_; | 194 bool context_lost_; |
180 | 195 |
181 DISALLOW_COPY_AND_ASSIGN(GLInProcessContext); | 196 DISALLOW_COPY_AND_ASSIGN(GLInProcessContext); |
182 }; | 197 }; |
183 | 198 |
184 namespace { | 199 namespace { |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
280 if (context->GetDecoder()) | 295 if (context->GetDecoder()) |
281 context->GetDecoder()->DetachFromThread(); | 296 context->GetDecoder()->DetachFromThread(); |
282 } | 297 } |
283 | 298 |
284 AutoLockAndDecoderDetachThread::~AutoLockAndDecoderDetachThread() { | 299 AutoLockAndDecoderDetachThread::~AutoLockAndDecoderDetachThread() { |
285 std::for_each(contexts_.begin(), | 300 std::for_each(contexts_.begin(), |
286 contexts_.end(), | 301 contexts_.end(), |
287 &DetachThread); | 302 &DetachThread); |
288 } | 303 } |
289 | 304 |
305 class ImageFactoryInProcess | |
306 : public ImageFactory, | |
307 public base::RefCountedThreadSafe<ImageFactoryInProcess> { | |
308 public: | |
309 explicit ImageFactoryInProcess(ImageManager* image_manager); | |
310 | |
311 // methods from ImageFactory | |
312 virtual scoped_ptr<GpuMemoryBuffer> CreateGpuMemoryBuffer( | |
313 int width, int height, GLenum internalformat, | |
314 unsigned* image_id) OVERRIDE; | |
315 virtual void DeleteGpuMemoryBuffer(unsigned image_id) OVERRIDE; | |
316 private: | |
317 friend class base::RefCountedThreadSafe<ImageFactoryInProcess>; | |
318 virtual ~ImageFactoryInProcess(); | |
319 | |
320 // ImageManager is referred by the ContextGroup and we don't | |
321 // want to change the refcount from another thread here. | |
322 ImageManager* image_manager_; | |
no sievers
2013/05/15 01:09:41
nit: I'd say 'the ContextGroup outlives the client
kaanb
2013/05/15 01:44:26
Done.
| |
323 unsigned next_id_; | |
324 | |
325 DISALLOW_COPY_AND_ASSIGN(ImageFactoryInProcess); | |
326 }; | |
327 | |
328 ImageFactoryInProcess::ImageFactoryInProcess( | |
329 ImageManager* image_manager) : image_manager_(image_manager), | |
330 next_id_(0) { | |
331 } | |
332 | |
333 ImageFactoryInProcess::~ImageFactoryInProcess() { | |
334 } | |
335 | |
336 scoped_ptr<GpuMemoryBuffer> ImageFactoryInProcess::CreateGpuMemoryBuffer( | |
337 int width, int height, GLenum internalformat, unsigned int* image_id) { | |
338 AutoLockAndDecoderDetachThread lock(g_decoder_lock.Get(), | |
no sievers
2013/05/15 01:09:41
nit: add a comment here and below that you are gra
kaanb
2013/05/15 01:44:26
Done.
| |
339 g_all_shared_contexts.Get()); | |
340 // TODO(kaanb): Check with reviewers if GL_RGBA8_OES is the right | |
341 // constant to use. If not which header should we include to make GL_RGBA8 | |
342 // visible? | |
343 // For Android WebView we assume the |internalformat| will always be | |
344 // GL_RGBA8_OES. | |
345 DCHECK_EQ(GL_RGBA8_OES, internalformat); | |
346 const GpuMemoryBuffer::Creator& create_gpu_memory_buffer_callback = | |
347 ::gpu::gles2::GetProcessDefaultGpuMemoryBufferFactory(); | |
348 scoped_ptr<GpuMemoryBuffer> buffer = | |
349 create_gpu_memory_buffer_callback.Run(width, height); | |
350 scoped_refptr<gfx::GLImage> gl_image = | |
351 gfx::GLImage::CreateGLImageForGpuMemoryBuffer(buffer->GetNativeBuffer(), | |
352 gfx::Size(width, height)); | |
353 *image_id = ++next_id_; // Valid image_ids start from 1. | |
354 image_manager_->AddImage(gl_image, *image_id); | |
355 return buffer.Pass(); | |
356 } | |
357 | |
358 void ImageFactoryInProcess::DeleteGpuMemoryBuffer(unsigned int image_id) { | |
359 AutoLockAndDecoderDetachThread lock(g_decoder_lock.Get(), | |
360 g_all_shared_contexts.Get()); | |
361 image_manager_->RemoveImage(image_id); | |
362 } | |
363 | |
290 } // namespace | 364 } // namespace |
291 | 365 |
292 static void CallAndDestroy( | 366 static void CallAndDestroy( |
293 scoped_ptr< | 367 scoped_ptr< |
294 WebKit::WebGraphicsContext3D::WebGraphicsSyncPointCallback> callback) { | 368 WebKit::WebGraphicsContext3D::WebGraphicsSyncPointCallback> callback) { |
295 callback->onSyncPointReached(); | 369 callback->onSyncPointReached(); |
296 } | 370 } |
297 | 371 |
298 void GLInProcessContext::PumpCommands() { | 372 void GLInProcessContext::PumpCommands() { |
299 if (!context_lost_) { | 373 if (!context_lost_) { |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
410 | 484 |
411 // TODO(gman): Remove This | 485 // TODO(gman): Remove This |
412 void GLInProcessContext::DisableShaderTranslation() { | 486 void GLInProcessContext::DisableShaderTranslation() { |
413 NOTREACHED(); | 487 NOTREACHED(); |
414 } | 488 } |
415 | 489 |
416 GLES2Implementation* GLInProcessContext::GetImplementation() { | 490 GLES2Implementation* GLInProcessContext::GetImplementation() { |
417 return gles2_implementation_.get(); | 491 return gles2_implementation_.get(); |
418 } | 492 } |
419 | 493 |
494 ::gpu::gles2::ImageManager* GLInProcessContext::GetImageManager() { | |
495 return decoder_->GetContextGroup()->image_manager(); | |
496 } | |
497 | |
498 scoped_refptr<ImageFactoryInProcess> GLInProcessContext::GetImageFactory() { | |
499 return image_factory_; | |
500 } | |
501 | |
420 GLInProcessContext::GLInProcessContext(bool share_resources) | 502 GLInProcessContext::GLInProcessContext(bool share_resources) |
421 : last_error_(SUCCESS), | 503 : last_error_(SUCCESS), |
422 share_resources_(share_resources), | 504 share_resources_(share_resources), |
423 context_lost_(false) { | 505 context_lost_(false) { |
424 } | 506 } |
425 | 507 |
426 bool GLInProcessContext::Initialize( | 508 bool GLInProcessContext::Initialize( |
427 bool is_offscreen, | 509 bool is_offscreen, |
428 gfx::AcceleratedWidget window, | 510 gfx::AcceleratedWidget window, |
429 const gfx::Size& size, | 511 const gfx::Size& size, |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
586 // Create the GLES2 helper, which writes the command buffer protocol. | 668 // Create the GLES2 helper, which writes the command buffer protocol. |
587 gles2_helper_.reset(new GLES2CmdHelper(command_buffer_.get())); | 669 gles2_helper_.reset(new GLES2CmdHelper(command_buffer_.get())); |
588 if (!gles2_helper_->Initialize(kCommandBufferSize)) { | 670 if (!gles2_helper_->Initialize(kCommandBufferSize)) { |
589 Destroy(); | 671 Destroy(); |
590 return false; | 672 return false; |
591 } | 673 } |
592 | 674 |
593 // Create a transfer buffer. | 675 // Create a transfer buffer. |
594 transfer_buffer_.reset(new TransferBuffer(gles2_helper_.get())); | 676 transfer_buffer_.reset(new TransferBuffer(gles2_helper_.get())); |
595 | 677 |
678 if (share_resources_) { | |
679 AutoLockAndDecoderDetachThread lock(g_decoder_lock.Get(), | |
680 g_all_shared_contexts.Get()); | |
681 if (g_all_shared_contexts.Get().empty()) { | |
682 // Create the image factory for the first context. | |
683 image_factory_ = new ImageFactoryInProcess(GetImageManager()); | |
684 } else { | |
685 // Share the image factory created by the first context. | |
686 GLInProcessContext* first_context = *g_all_shared_contexts.Get().begin(); | |
687 image_factory_ = first_context->GetImageFactory(); | |
688 } | |
689 } else { | |
690 // Create the image factory, this object retains its ownership. | |
691 image_factory_ = new ImageFactoryInProcess(GetImageManager()); | |
692 } | |
693 | |
596 // Create the object exposing the OpenGL API. | 694 // Create the object exposing the OpenGL API. |
597 gles2_implementation_.reset(new GLES2Implementation( | 695 gles2_implementation_.reset(new GLES2Implementation( |
598 gles2_helper_.get(), | 696 gles2_helper_.get(), |
599 context_group ? context_group->GetImplementation()->share_group() : NULL, | 697 context_group ? context_group->GetImplementation()->share_group() : NULL, |
600 transfer_buffer_.get(), | 698 transfer_buffer_.get(), |
601 true, | 699 true, |
602 false)); | 700 false, |
701 image_factory_)); | |
603 | 702 |
604 if (!gles2_implementation_->Initialize( | 703 if (!gles2_implementation_->Initialize( |
605 kStartTransferBufferSize, | 704 kStartTransferBufferSize, |
606 kMinTransferBufferSize, | 705 kMinTransferBufferSize, |
607 kMaxTransferBufferSize)) { | 706 kMaxTransferBufferSize)) { |
608 return false; | 707 return false; |
609 } | 708 } |
610 | 709 |
611 if (share_resources_) { | 710 if (share_resources_) { |
612 AutoLockAndDecoderDetachThread lock(g_decoder_lock.Get(), | 711 AutoLockAndDecoderDetachThread lock(g_decoder_lock.Get(), |
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1089 return gl_->glname(a1, a2); \ | 1188 return gl_->glname(a1, a2); \ |
1090 } | 1189 } |
1091 | 1190 |
1092 #define DELEGATE_TO_GL_3(name, glname, t1, t2, t3) \ | 1191 #define DELEGATE_TO_GL_3(name, glname, t1, t2, t3) \ |
1093 void WebGraphicsContext3DInProcessCommandBufferImpl::name( \ | 1192 void WebGraphicsContext3DInProcessCommandBufferImpl::name( \ |
1094 t1 a1, t2 a2, t3 a3) { \ | 1193 t1 a1, t2 a2, t3 a3) { \ |
1095 ClearContext(); \ | 1194 ClearContext(); \ |
1096 gl_->glname(a1, a2, a3); \ | 1195 gl_->glname(a1, a2, a3); \ |
1097 } | 1196 } |
1098 | 1197 |
1198 #define DELEGATE_TO_GL_3R(name, glname, t1, t2, t3, rt) \ | |
1199 rt WebGraphicsContext3DInProcessCommandBufferImpl::name( \ | |
1200 t1 a1, t2 a2, t3 a3) { \ | |
1201 ClearContext(); \ | |
1202 return gl_->glname(a1, a2, a3); \ | |
1203 } | |
1204 | |
1099 #define DELEGATE_TO_GL_4(name, glname, t1, t2, t3, t4) \ | 1205 #define DELEGATE_TO_GL_4(name, glname, t1, t2, t3, t4) \ |
1100 void WebGraphicsContext3DInProcessCommandBufferImpl::name( \ | 1206 void WebGraphicsContext3DInProcessCommandBufferImpl::name( \ |
1101 t1 a1, t2 a2, t3 a3, t4 a4) { \ | 1207 t1 a1, t2 a2, t3 a3, t4 a4) { \ |
1102 ClearContext(); \ | 1208 ClearContext(); \ |
1103 gl_->glname(a1, a2, a3, a4); \ | 1209 gl_->glname(a1, a2, a3, a4); \ |
1104 } | 1210 } |
1105 | 1211 |
1106 #define DELEGATE_TO_GL_5(name, glname, t1, t2, t3, t4, t5) \ | 1212 #define DELEGATE_TO_GL_5(name, glname, t1, t2, t3, t4, t5) \ |
1107 void WebGraphicsContext3DInProcessCommandBufferImpl::name( \ | 1213 void WebGraphicsContext3DInProcessCommandBufferImpl::name( \ |
1108 t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) { \ | 1214 t1 a1, t2 a2, t3 a3, t4 a4, t5 a5) { \ |
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1822 } | 1928 } |
1823 | 1929 |
1824 void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() { | 1930 void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() { |
1825 // TODO(kbr): improve the precision here. | 1931 // TODO(kbr): improve the precision here. |
1826 context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB; | 1932 context_lost_reason_ = GL_UNKNOWN_CONTEXT_RESET_ARB; |
1827 if (context_lost_callback_) { | 1933 if (context_lost_callback_) { |
1828 context_lost_callback_->onContextLost(); | 1934 context_lost_callback_->onContextLost(); |
1829 } | 1935 } |
1830 } | 1936 } |
1831 | 1937 |
1938 DELEGATE_TO_GL_3R(createImageCHROMIUM, CreateImageCHROMIUM, | |
1939 WGC3Dsizei, WGC3Dsizei, WGC3Denum, WGC3Duint); | |
1940 | |
1941 DELEGATE_TO_GL_1(destroyImageCHROMIUM, DestroyImageCHROMIUM, WGC3Duint); | |
1942 | |
1943 DELEGATE_TO_GL_3(getImageParameterivCHROMIUM, GetImageParameterivCHROMIUM, | |
1944 WGC3Duint, WGC3Denum, GLint*); | |
1945 | |
1946 DELEGATE_TO_GL_2R(mapImageCHROMIUM, MapImageCHROMIUM, | |
1947 WGC3Duint, WGC3Denum, void*); | |
1948 | |
1949 DELEGATE_TO_GL_1(unmapImageCHROMIUM, UnmapImageCHROMIUM, WGC3Duint); | |
1950 | |
1832 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM, | 1951 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM, |
1833 WebGLId, WGC3Dint, const WGC3Dchar*) | 1952 WebGLId, WGC3Dint, const WGC3Dchar*) |
1834 | 1953 |
1835 DELEGATE_TO_GL(shallowFlushCHROMIUM, ShallowFlushCHROMIUM) | 1954 DELEGATE_TO_GL(shallowFlushCHROMIUM, ShallowFlushCHROMIUM) |
1836 | 1955 |
1837 DELEGATE_TO_GL_1(genMailboxCHROMIUM, GenMailboxCHROMIUM, WGC3Dbyte*) | 1956 DELEGATE_TO_GL_1(genMailboxCHROMIUM, GenMailboxCHROMIUM, WGC3Dbyte*) |
1838 DELEGATE_TO_GL_2(produceTextureCHROMIUM, ProduceTextureCHROMIUM, | 1957 DELEGATE_TO_GL_2(produceTextureCHROMIUM, ProduceTextureCHROMIUM, |
1839 WGC3Denum, const WGC3Dbyte*) | 1958 WGC3Denum, const WGC3Dbyte*) |
1840 DELEGATE_TO_GL_2(consumeTextureCHROMIUM, ConsumeTextureCHROMIUM, | 1959 DELEGATE_TO_GL_2(consumeTextureCHROMIUM, ConsumeTextureCHROMIUM, |
1841 WGC3Denum, const WGC3Dbyte*) | 1960 WGC3Denum, const WGC3Dbyte*) |
(...skipping 26 matching lines...) Expand all Loading... | |
1868 | 1987 |
1869 DELEGATE_TO_GL_9(asyncTexSubImage2DCHROMIUM, AsyncTexSubImage2DCHROMIUM, | 1988 DELEGATE_TO_GL_9(asyncTexSubImage2DCHROMIUM, AsyncTexSubImage2DCHROMIUM, |
1870 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei, | 1989 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei, |
1871 WGC3Denum, WGC3Denum, const void*) | 1990 WGC3Denum, WGC3Denum, const void*) |
1872 | 1991 |
1873 DELEGATE_TO_GL_1(waitAsyncTexImage2DCHROMIUM, WaitAsyncTexImage2DCHROMIUM, | 1992 DELEGATE_TO_GL_1(waitAsyncTexImage2DCHROMIUM, WaitAsyncTexImage2DCHROMIUM, |
1874 WGC3Denum) | 1993 WGC3Denum) |
1875 | 1994 |
1876 } // namespace gpu | 1995 } // namespace gpu |
1877 } // namespace webkit | 1996 } // namespace webkit |
OLD | NEW |