diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-01 12:59:39 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:40:43 +0000 |
commit | 28b1110370900897ab652cb420c371fab8857ad4 (patch) | |
tree | 41b32127d23b0df4f2add2a27e12dc87bddb260e /chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h | |
parent | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (diff) |
BASELINE: Update Chromium to 53.0.2785.41
Also adds a few extra files for extensions.
Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h')
-rw-r--r-- | chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h b/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h index 1daa97b4d79..540e6c3c692 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h @@ -59,8 +59,6 @@ class TextureGL : public TextureImpl BlitGL *blitter); ~TextureGL() override; - void setUsage(GLenum usage) override; - gl::Error setImage(GLenum target, size_t level, GLenum internalFormat, const gl::Extents &size, GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const uint8_t *pixels) override; gl::Error setSubImage(GLenum target, size_t level, const gl::Box &area, GLenum format, GLenum type, @@ -82,7 +80,7 @@ class TextureGL : public TextureImpl egl::Stream *stream, const egl::Stream::GLTextureDescription &desc) override; - gl::Error generateMipmaps() override; + gl::Error generateMipmap() override; void bindTexImage(egl::Surface *surface) override; void releaseTexImage() override; @@ -101,6 +99,27 @@ class TextureGL : public TextureImpl void setBaseLevel(GLuint) override {} private: + void setImageHelper(GLenum target, + size_t level, + GLenum internalFormat, + const gl::Extents &size, + GLenum format, + GLenum type, + const uint8_t *pixels); + void reserveTexImageToBeFilled(GLenum target, + size_t level, + GLenum internalFormat, + const gl::Extents &size, + GLenum format, + GLenum type); + gl::Error setSubImageRowByRowWorkaround(GLenum target, + size_t level, + const gl::Box &area, + GLenum format, + GLenum type, + const gl::PixelUnpackState &unpack, + const uint8_t *pixels); + const FunctionsGL *mFunctions; const WorkaroundsGL &mWorkarounds; StateManagerGL *mStateManager; |