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

Side by Side Diff: Source/modules/webgl/WebGLRenderingContext.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: Clean and Remove unnecessary enum. Created 5 years, 4 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

« Source/modules/webgl/WebGLCompressedTextureASTC.idl ('K') | « Source/modules/webgl/WebGLExtensionName.h ('k') | Source/modules/webgl/WebGLRenderingContext.cpp » ('j') | Source/modules/webgl/WebGLRenderingContext.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
72 RefPtrWillBeMember<OESTextureFloatLinear> m_oesTextureFloatLinear;	72 RefPtrWillBeMember<OESTextureFloatLinear> m_oesTextureFloatLinear;

73 RefPtrWillBeMember<OESTextureHalfFloat> m_oesTextureHalfFloat;	73 RefPtrWillBeMember<OESTextureHalfFloat> m_oesTextureHalfFloat;

74 RefPtrWillBeMember<OESTextureHalfFloatLinear> m_oesTextureHalfFloatLinear;	74 RefPtrWillBeMember<OESTextureHalfFloatLinear> m_oesTextureHalfFloatLinear;

75 RefPtrWillBeMember<OESStandardDerivatives> m_oesStandardDerivatives;	75 RefPtrWillBeMember<OESStandardDerivatives> m_oesStandardDerivatives;

76 RefPtrWillBeMember<OESVertexArrayObject> m_oesVertexArrayObject;	76 RefPtrWillBeMember<OESVertexArrayObject> m_oesVertexArrayObject;

77 RefPtrWillBeMember<OESElementIndexUint> m_oesElementIndexUint;	77 RefPtrWillBeMember<OESElementIndexUint> m_oesElementIndexUint;

78 RefPtrWillBeMember<WebGLLoseContext> m_webglLoseContext;	78 RefPtrWillBeMember<WebGLLoseContext> m_webglLoseContext;

79 RefPtrWillBeMember<WebGLDebugRendererInfo> m_webglDebugRendererInfo;	79 RefPtrWillBeMember<WebGLDebugRendererInfo> m_webglDebugRendererInfo;

80 RefPtrWillBeMember<WebGLDebugShaders> m_webglDebugShaders;	80 RefPtrWillBeMember<WebGLDebugShaders> m_webglDebugShaders;

81 RefPtrWillBeMember<WebGLDrawBuffers> m_webglDrawBuffers;	81 RefPtrWillBeMember<WebGLDrawBuffers> m_webglDrawBuffers;

	82 RefPtrWillBeMember<WebGLCompressedTextureASTC> m_webglCompressedTextureASTC;
	Ken Russell (switch to Gerrit) 2015/08/18 00:05:03 Needs to be updated. Is now "PersistentWillBeMembe Needs to be updated. Is now "PersistentWillBeMember".
82 RefPtrWillBeMember<WebGLCompressedTextureATC> m_webglCompressedTextureATC;	83 RefPtrWillBeMember<WebGLCompressedTextureATC> m_webglCompressedTextureATC;

83 RefPtrWillBeMember<WebGLCompressedTextureETC1> m_webglCompressedTextureETC1;	84 RefPtrWillBeMember<WebGLCompressedTextureETC1> m_webglCompressedTextureETC1;

84 RefPtrWillBeMember<WebGLCompressedTexturePVRTC> m_webglCompressedTexturePVRT C;	85 RefPtrWillBeMember<WebGLCompressedTexturePVRTC> m_webglCompressedTexturePVRT C;

85 RefPtrWillBeMember<WebGLCompressedTextureS3TC> m_webglCompressedTextureS3TC;	86 RefPtrWillBeMember<WebGLCompressedTextureS3TC> m_webglCompressedTextureS3TC;

86 RefPtrWillBeMember<WebGLDepthTexture> m_webglDepthTexture;	87 RefPtrWillBeMember<WebGLDepthTexture> m_webglDepthTexture;

87 };	88 };

88	89

89 DEFINE_TYPE_CASTS(WebGLRenderingContext, CanvasRenderingContext, context,	90 DEFINE_TYPE_CASTS(WebGLRenderingContext, CanvasRenderingContext, context,

90 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) == 1,	91 context->is3d() && WebGLRenderingContextBase::getWebGLVersion(context) == 1,

91 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) == 1) ;	92 context.is3d() && WebGLRenderingContextBase::getWebGLVersion(&context) == 1) ;

92	93

93 } // namespace blink	94 } // namespace blink

94	95

95 #endif // WebGLRenderingContext_h	96 #endif // WebGLRenderingContext_h

OLD	NEW