Source/modules/webgl/WebGL2RenderingContext.h - Issue 1265703005: Implement the texture uploading of ASTC compression for WebGL(part II)

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

Issue 1265703005: Implement the texture uploading of ASTC compression for WebGL(part II) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add braces. 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

« no previous file with comments | « Source/modules/modules.gypi ('k') | Source/modules/webgl/WebGL2RenderingContext.cpp » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 #ifndef WebGL2RenderingContext_h	5 #ifndef WebGL2RenderingContext_h

6 #define WebGL2RenderingContext_h	6 #define WebGL2RenderingContext_h

7	7

8 #include "core/html/canvas/CanvasRenderingContextFactory.h"	8 #include "core/html/canvas/CanvasRenderingContextFactory.h"

9 #include "modules/webgl/WebGL2RenderingContextBase.h"	9 #include "modules/webgl/WebGL2RenderingContextBase.h"

10	10

(...skipping 23 matching lines...) Expand all Loading...
34 void registerContextExtensions() override;	34 void registerContextExtensions() override;

35	35

36 DECLARE_VIRTUAL_TRACE();	36 DECLARE_VIRTUAL_TRACE();

37	37

38 protected:	38 protected:

39 WebGL2RenderingContext(HTMLCanvasElement* passedCanvas, PassOwnPtr<WebGraphi csContext3D>, const WebGLContextAttributes& requestedAttributes);	39 WebGL2RenderingContext(HTMLCanvasElement* passedCanvas, PassOwnPtr<WebGraphi csContext3D>, const WebGLContextAttributes& requestedAttributes);

40	40

41 PersistentWillBeMember<CHROMIUMSubscribeUniform> m_chromiumSubscribeUniform;	41 PersistentWillBeMember<CHROMIUMSubscribeUniform> m_chromiumSubscribeUniform;

42 PersistentWillBeMember<EXTTextureFilterAnisotropic> m_extTextureFilterAnisot ropic;	42 PersistentWillBeMember<EXTTextureFilterAnisotropic> m_extTextureFilterAnisot ropic;

43 PersistentWillBeMember<OESTextureFloatLinear> m_oesTextureFloatLinear;	43 PersistentWillBeMember<OESTextureFloatLinear> m_oesTextureFloatLinear;

	44 PersistentWillBeMember<WebGLCompressedTextureASTC> m_webglCompressedTextureA STC;

44 PersistentWillBeMember<WebGLCompressedTextureATC> m_webglCompressedTextureAT C;	45 PersistentWillBeMember<WebGLCompressedTextureATC> m_webglCompressedTextureAT C;

45 PersistentWillBeMember<WebGLCompressedTextureETC1> m_webglCompressedTextureE TC1;	46 PersistentWillBeMember<WebGLCompressedTextureETC1> m_webglCompressedTextureE TC1;

46 PersistentWillBeMember<WebGLCompressedTexturePVRTC> m_webglCompressedTexture PVRTC;	47 PersistentWillBeMember<WebGLCompressedTexturePVRTC> m_webglCompressedTexture PVRTC;

47 PersistentWillBeMember<WebGLCompressedTextureS3TC> m_webglCompressedTextureS 3TC;	48 PersistentWillBeMember<WebGLCompressedTextureS3TC> m_webglCompressedTextureS 3TC;

48 PersistentWillBeMember<WebGLDebugRendererInfo> m_webglDebugRendererInfo;	49 PersistentWillBeMember<WebGLDebugRendererInfo> m_webglDebugRendererInfo;

49 PersistentWillBeMember<WebGLDebugShaders> m_webglDebugShaders;	50 PersistentWillBeMember<WebGLDebugShaders> m_webglDebugShaders;

50 PersistentWillBeMember<WebGLLoseContext> m_webglLoseContext;	51 PersistentWillBeMember<WebGLLoseContext> m_webglLoseContext;

51 };	52 };

52	53

53 DEFINE_TYPE_CASTS(WebGL2RenderingContext, CanvasRenderingContext, context,	54 DEFINE_TYPE_CASTS(WebGL2RenderingContext, CanvasRenderingContext, context,

54 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) == 2,	55 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) == 2,

55 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) == 2) ;	56 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) == 2) ;

56	57

57 } // namespace blink	58 } // namespace blink

58	59

59 #endif	60 #endif

OLD	NEW