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

Side by Side Diff: Source/WebCore/html/canvas/WebGLRenderingContext.h

Issue 10584035: Merge 120636 - Fix framebuffer-object-attachment.html failures (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 // Precise but slow index validation -- only done if conservative checks fai l 361 // Precise but slow index validation -- only done if conservative checks fai l
362 bool validateIndexArrayPrecise(GC3Dsizei count, GC3Denum type, GC3Dintptr of fset, int& numElementsRequired); 362 bool validateIndexArrayPrecise(GC3Dsizei count, GC3Denum type, GC3Dintptr of fset, int& numElementsRequired);
363 // If numElements <= 0, we only check if each enabled vertex attribute is bo und to a buffer. 363 // If numElements <= 0, we only check if each enabled vertex attribute is bo und to a buffer.
364 bool validateRenderingState(int numElements); 364 bool validateRenderingState(int numElements);
365 365
366 bool validateWebGLObject(const char*, WebGLObject*); 366 bool validateWebGLObject(const char*, WebGLObject*);
367 367
368 // Adds a compressed texture format. 368 // Adds a compressed texture format.
369 void addCompressedTextureFormat(GC3Denum); 369 void addCompressedTextureFormat(GC3Denum);
370 370
371 // Reattaches depth and stencil attachments after one has been unattached.
372 void reattachDepthStencilAttachments(bool reattachDepth, bool reattachStenci l, bool reattachDepthStencilDepth, bool reattachDepthStencilStencil);
373
374 #if ENABLE(VIDEO) 371 #if ENABLE(VIDEO)
375 PassRefPtr<Image> videoFrameToImage(HTMLVideoElement*, ExceptionCode&); 372 PassRefPtr<Image> videoFrameToImage(HTMLVideoElement*, ExceptionCode&);
376 #endif 373 #endif
377 374
378 RefPtr<GraphicsContext3D> m_context; 375 RefPtr<GraphicsContext3D> m_context;
379 RefPtr<WebGLContextGroup> m_contextGroup; 376 RefPtr<WebGLContextGroup> m_contextGroup;
380 377
381 // Optional structure for rendering to a DrawingBuffer, instead of directly 378 // Optional structure for rendering to a DrawingBuffer, instead of directly
382 // to the back-buffer of m_context. 379 // to the back-buffer of m_context.
383 RefPtr<DrawingBuffer> m_drawingBuffer; 380 RefPtr<DrawingBuffer> m_drawingBuffer;
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 706
710 // Helper for enabling or disabling a capability. 707 // Helper for enabling or disabling a capability.
711 void enableOrDisable(GC3Denum capability, bool enable); 708 void enableOrDisable(GC3Denum capability, bool enable);
712 709
713 friend class WebGLStateRestorer; 710 friend class WebGLStateRestorer;
714 }; 711 };
715 712
716 } // namespace WebCore 713 } // namespace WebCore
717 714
718 #endif 715 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/html/canvas/WebGLFramebuffer.cpp ('k') | Source/WebCore/html/canvas/WebGLRenderingContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698