Index: third_party/WebKit/Source/modules/webgl/WebGLTexture.h |
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLTexture.h b/third_party/WebKit/Source/modules/webgl/WebGLTexture.h |
index 33784cc54bc88de443482afde31a7f8d1dfd7c34..9d3457035b8f4e238f5b65749b64afc493a5c9a9 100644 |
--- a/third_party/WebKit/Source/modules/webgl/WebGLTexture.h |
+++ b/third_party/WebKit/Source/modules/webgl/WebGLTexture.h |
@@ -60,30 +60,11 @@ public: |
int getMinFilter() const { return m_samplerState.minFilter; } |
- void setLevelInfo(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum type); |
- void setTexStorageInfo(GLenum target, GLint levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); |
- |
- bool canGenerateMipmaps(); |
- // Generate all level information. |
- void generateMipmapLevelInfo(); |
- |
- GLenum getInternalFormat(GLenum target, GLint level) const; |
- GLenum getType(GLenum target, GLint level) const; |
- GLsizei getWidth(GLenum target, GLint level) const; |
- GLsizei getHeight(GLenum target, GLint level) const; |
- GLsizei getDepth(GLenum target, GLint level) const; |
- bool isValid(GLenum target, GLint level) const; |
- bool isImmutable() const { return m_immutable; } |
- |
static GLenum getValidFormatForInternalFormat(GLenum); |
- bool isCubeComplete() const { return m_isCubeComplete; } |
- |
// Whether width/height is NotPowerOfTwo. |
static bool isNPOT(GLsizei, GLsizei); |
- bool isNPOT() const; |
- |
bool hasEverBeenBound() const { return object() && m_target; } |
static GLint computeLevelCount(GLsizei width, GLsizei height, GLsizei depth); |
@@ -96,57 +77,15 @@ private: |
void deleteObjectImpl(WebGraphicsContext3D*) override; |
- class LevelInfo { |
- public: |
- LevelInfo() |
- : valid(false) |
- , internalFormat(0) |
- , width(0) |
- , height(0) |
- , depth(0) |
- , type(0) |
- { |
- } |
- |
- void setInfo(GLenum internalFmt, GLsizei w, GLsizei h, GLsizei d, GLenum tp) |
- { |
- valid = true; |
- internalFormat = internalFmt; |
- width = w; |
- height = h; |
- depth = d; |
- type = tp; |
- } |
- |
- bool valid; |
- GLenum internalFormat; |
- GLsizei width; |
- GLsizei height; |
- GLsizei depth; |
- GLenum type; |
- }; |
- |
bool isTexture() const override { return true; } |
- void update(); |
- |
int mapTargetToIndex(GLenum) const; |
- const LevelInfo* getLevelInfo(GLenum target, GLint level) const; |
- |
GLenum m_target; |
WebGLSamplerState m_samplerState; |
- Vector<Vector<LevelInfo>> m_info; |
- |
- bool m_isNPOT; |
- bool m_isCubeComplete; |
- bool m_isComplete; |
- bool m_isFloatType; |
- bool m_isHalfFloatType; |
bool m_isWebGL2OrHigher; |
- bool m_immutable; |
size_t m_baseLevel; |
size_t m_maxLevel; |
}; |