diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
| commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
| tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h | |
| parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@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 | 4 |
1 files changed, 3 insertions, 1 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 1621c5a59e1..4a48acb1720 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h +++ b/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h @@ -155,7 +155,7 @@ class TextureGL : public TextureImpl GLsizei samples, GLint internalFormat, const gl::Extents &size, - GLboolean fixedSampleLocations) override; + bool fixedSampleLocations) override; gl::Error setImageExternal(const gl::Context *context, GLenum target, @@ -209,6 +209,7 @@ class TextureGL : public TextureImpl GLenum format, GLenum type, const gl::PixelUnpackState &unpack, + const gl::Buffer *unpackBuffer, const uint8_t *pixels); gl::Error setSubImagePaddingWorkaround(const gl::Context *context, @@ -218,6 +219,7 @@ class TextureGL : public TextureImpl GLenum format, GLenum type, const gl::PixelUnpackState &unpack, + const gl::Buffer *unpackBuffer, const uint8_t *pixels); void syncTextureStateSwizzle(const FunctionsGL *functions, |