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

Side by Side Diff: Source/modules/webgl/WebGLRenderingContextBase.h

Issue 1325453007: Added support for EXTDisjointTimerQuery on the Blink side. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: GL_INVALID_ENUM when timer query not enabled for GetParameter, use context3d for deletion Created 5 years, 3 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 namespace blink { 55 namespace blink {
56 class WebLayer; 56 class WebLayer;
57 } 57 }
58 58
59 namespace blink { 59 namespace blink {
60 60
61 class ANGLEInstancedArrays; 61 class ANGLEInstancedArrays;
62 class CHROMIUMSubscribeUniform; 62 class CHROMIUMSubscribeUniform;
63 class CHROMIUMValuebuffer; 63 class CHROMIUMValuebuffer;
64 class EXTBlendMinMax; 64 class EXTBlendMinMax;
65 class EXTDisjointTimerQuery;
65 class EXTFragDepth; 66 class EXTFragDepth;
66 class EXTShaderTextureLOD; 67 class EXTShaderTextureLOD;
67 class EXTsRGB; 68 class EXTsRGB;
68 class EXTTextureFilterAnisotropic; 69 class EXTTextureFilterAnisotropic;
69 class ExceptionState; 70 class ExceptionState;
70 class HTMLImageElement; 71 class HTMLImageElement;
71 class HTMLVideoElement; 72 class HTMLVideoElement;
72 class ImageBuffer; 73 class ImageBuffer;
73 class ImageData; 74 class ImageData;
74 class IntSize; 75 class IntSize;
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 Member<WebGLTexture> m_texture3DBinding; 426 Member<WebGLTexture> m_texture3DBinding;
426 Member<WebGLTexture> m_texture2DArrayBinding; 427 Member<WebGLTexture> m_texture2DArrayBinding;
427 428
428 DECLARE_TRACE(); 429 DECLARE_TRACE();
429 }; 430 };
430 431
431 void setFilterQuality(SkFilterQuality) override; 432 void setFilterQuality(SkFilterQuality) override;
432 bool isWebGL2OrHigher() { return version() >= 2; } 433 bool isWebGL2OrHigher() { return version() >= 2; }
433 434
434 protected: 435 protected:
436 friend class EXTDisjointTimerQuery;
435 friend class WebGLDrawBuffers; 437 friend class WebGLDrawBuffers;
436 friend class WebGLFramebuffer; 438 friend class WebGLFramebuffer;
437 friend class WebGLObject; 439 friend class WebGLObject;
438 friend class WebGLContextObject; 440 friend class WebGLContextObject;
439 friend class OESVertexArrayObject; 441 friend class OESVertexArrayObject;
440 friend class WebGLDebugShaders; 442 friend class WebGLDebugShaders;
441 friend class WebGLCompressedTextureASTC; 443 friend class WebGLCompressedTextureASTC;
442 friend class WebGLCompressedTextureATC; 444 friend class WebGLCompressedTextureATC;
443 friend class WebGLCompressedTextureETC1; 445 friend class WebGLCompressedTextureETC1;
444 friend class WebGLCompressedTexturePVRTC; 446 friend class WebGLCompressedTexturePVRTC;
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 std::set<GLenum> m_supportedInternalFormats; 785 std::set<GLenum> m_supportedInternalFormats;
784 std::set<GLenum> m_supportedFormats; 786 std::set<GLenum> m_supportedFormats;
785 std::set<GLenum> m_supportedTypes; 787 std::set<GLenum> m_supportedTypes;
786 std::set<FormatType, FormatTypeCompare> m_supportedFormatTypeCombinations; 788 std::set<FormatType, FormatTypeCompare> m_supportedFormatTypeCombinations;
787 789
788 // Helpers for getParameter and others 790 // Helpers for getParameter and others
789 ScriptValue getBooleanParameter(ScriptState*, GLenum); 791 ScriptValue getBooleanParameter(ScriptState*, GLenum);
790 ScriptValue getBooleanArrayParameter(ScriptState*, GLenum); 792 ScriptValue getBooleanArrayParameter(ScriptState*, GLenum);
791 ScriptValue getFloatParameter(ScriptState*, GLenum); 793 ScriptValue getFloatParameter(ScriptState*, GLenum);
792 ScriptValue getIntParameter(ScriptState*, GLenum); 794 ScriptValue getIntParameter(ScriptState*, GLenum);
795 ScriptValue getInt64Parameter(ScriptState*, GLenum);
793 ScriptValue getUnsignedIntParameter(ScriptState*, GLenum); 796 ScriptValue getUnsignedIntParameter(ScriptState*, GLenum);
794 ScriptValue getWebGLFloatArrayParameter(ScriptState*, GLenum); 797 ScriptValue getWebGLFloatArrayParameter(ScriptState*, GLenum);
795 ScriptValue getWebGLIntArrayParameter(ScriptState*, GLenum); 798 ScriptValue getWebGLIntArrayParameter(ScriptState*, GLenum);
796 799
797 // Clear the backbuffer if it was composited since the last operation. 800 // Clear the backbuffer if it was composited since the last operation.
798 // clearMask is set to the bitfield of any clear that would happen anyway at this time 801 // clearMask is set to the bitfield of any clear that would happen anyway at this time
799 // and the function returns |CombinedClear| if that clear is now unnecessary . 802 // and the function returns |CombinedClear| if that clear is now unnecessary .
800 enum HowToClear { 803 enum HowToClear {
801 // Skip clearing the backbuffer. 804 // Skip clearing the backbuffer.
802 Skipped, 805 Skipped,
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 static IntSize oldestContextSize(); 1106 static IntSize oldestContextSize();
1104 }; 1107 };
1105 1108
1106 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d()); 1109 DEFINE_TYPE_CASTS(WebGLRenderingContextBase, CanvasRenderingContext, context, co ntext->is3d(), context.is3d());
1107 1110
1108 } // namespace blink 1111 } // namespace blink
1109 1112
1110 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextB ase::TextureUnitState); 1113 WTF_ALLOW_MOVE_INIT_AND_COMPARE_WITH_MEM_FUNCTIONS(blink::WebGLRenderingContextB ase::TextureUnitState);
1111 1114
1112 #endif // WebGLRenderingContextBase_h 1115 #endif // WebGLRenderingContextBase_h
OLDNEW
« no previous file with comments | « Source/modules/webgl/WebGLRenderingContext.cpp ('k') | Source/modules/webgl/WebGLRenderingContextBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698