third_party/WebKit/Source/modules/webgl/WebGLTexture.h - Issue 1468883002: Fix the crash of compressedTexImage3D for the WebGL2 conformance test page.

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGLTexture.h

Issue 1468883002: Fix the crash of compressedTexImage3D for the WebGL2 conformance test page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add the check validation of level. Created 5 years, 1 month 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

« third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp ('K') | « third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp ('k') | third_party/WebKit/Source/modules/webgl/WebGLTexture.cpp » ('j') | no next file with comments »
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 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
57 bool canGenerateMipmaps();	57 bool canGenerateMipmaps();

58 // Generate all level information.	58 // Generate all level information.

59 void generateMipmapLevelInfo();	59 void generateMipmapLevelInfo();

60	60

61 GLenum getInternalFormat(GLenum target, GLint level) const;	61 GLenum getInternalFormat(GLenum target, GLint level) const;

62 GLenum getType(GLenum target, GLint level) const;	62 GLenum getType(GLenum target, GLint level) const;

63 GLsizei getWidth(GLenum target, GLint level) const;	63 GLsizei getWidth(GLenum target, GLint level) const;

64 GLsizei getHeight(GLenum target, GLint level) const;	64 GLsizei getHeight(GLenum target, GLint level) const;

65 GLsizei getDepth(GLenum target, GLint level) const;	65 GLsizei getDepth(GLenum target, GLint level) const;

66 bool isValid(GLenum target, GLint level) const;	66 bool isValid(GLenum target, GLint level) const;

	67 bool isValidLevel(GLenum target, GLint level) const;

67 bool isImmutable() const { return m_immutable; }	68 bool isImmutable() const { return m_immutable; }

68	69

69 static GLenum getValidFormatForInternalFormat(GLenum);	70 static GLenum getValidFormatForInternalFormat(GLenum);

70	71

71 // Whether width/height is NotPowerOfTwo.	72 // Whether width/height is NotPowerOfTwo.

72 static bool isNPOT(GLsizei, GLsizei);	73 static bool isNPOT(GLsizei, GLsizei);

73	74

74 bool isNPOT() const;	75 bool isNPOT() const;

75 // Determine if texture sampling should always return [0, 0, 0, 1] (OpenGL E S 2.0 Sec 3.8.2).	76 // Determine if texture sampling should always return [0, 0, 0, 1] (OpenGL E S 2.0 Sec 3.8.2).

76 bool needToUseBlackTexture(TextureExtensionFlag) const;	77 bool needToUseBlackTexture(TextureExtensionFlag) const;

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 bool m_isHalfFloatType;	142 bool m_isHalfFloatType;

142 bool m_isWebGL2OrHigher;	143 bool m_isWebGL2OrHigher;

143 bool m_immutable;	144 bool m_immutable;

144 size_t m_baseLevel;	145 size_t m_baseLevel;

145 size_t m_maxLevel;	146 size_t m_maxLevel;

146 };	147 };

147	148

148 } // namespace blink	149 } // namespace blink

149	150

150 #endif // WebGLTexture_h	151 #endif // WebGLTexture_h

OLD	NEW