diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/gl/scoped_binders.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/gl/scoped_binders.cc')
| -rw-r--r-- | chromium/ui/gl/scoped_binders.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/ui/gl/scoped_binders.cc b/chromium/ui/gl/scoped_binders.cc index f44272e878e..9375094bb01 100644 --- a/chromium/ui/gl/scoped_binders.cc +++ b/chromium/ui/gl/scoped_binders.cc @@ -11,7 +11,7 @@ namespace gl { ScopedFramebufferBinder::ScopedFramebufferBinder(unsigned int fbo) : state_restorer_(!GLContext::GetCurrent() - ? NULL + ? nullptr : GLContext::GetCurrent()->GetGLStateRestorer()), old_fbo_(-1) { if (!state_restorer_) @@ -31,7 +31,7 @@ ScopedFramebufferBinder::~ScopedFramebufferBinder() { ScopedActiveTexture::ScopedActiveTexture(unsigned int texture) : state_restorer_(!GLContext::GetCurrent() - ? NULL + ? nullptr : GLContext::GetCurrent()->GetGLStateRestorer()), old_texture_(-1) { if (!state_restorer_) @@ -51,7 +51,7 @@ ScopedActiveTexture::~ScopedActiveTexture() { ScopedTextureBinder::ScopedTextureBinder(unsigned int target, unsigned int id) : state_restorer_(!GLContext::GetCurrent() - ? NULL + ? nullptr : GLContext::GetCurrent()->GetGLStateRestorer()), target_(target), old_id_(-1) { @@ -90,7 +90,7 @@ ScopedTextureBinder::~ScopedTextureBinder() { ScopedUseProgram::ScopedUseProgram(unsigned int program) : state_restorer_(!GLContext::GetCurrent() - ? NULL + ? nullptr : GLContext::GetCurrent()->GetGLStateRestorer()), old_program_(-1) { if (!state_restorer_) @@ -115,7 +115,7 @@ ScopedVertexAttribArray::ScopedVertexAttribArray(unsigned int index, int stride, const void* pointer) : state_restorer_(!GLContext::GetCurrent() - ? NULL + ? nullptr : GLContext::GetCurrent()->GetGLStateRestorer()), buffer_(0), enabled_(GL_FALSE), @@ -124,7 +124,7 @@ ScopedVertexAttribArray::ScopedVertexAttribArray(unsigned int index, type_(-1), normalized_(GL_FALSE), stride_(0), - pointer_(0) { + pointer_(nullptr) { if (!state_restorer_) { glGetVertexAttribiv(index, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, &buffer_); glGetVertexAttribiv(index, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &enabled_); @@ -154,7 +154,7 @@ ScopedVertexAttribArray::~ScopedVertexAttribArray() { ScopedBufferBinder::ScopedBufferBinder(unsigned int target, unsigned int id) : state_restorer_(!GLContext::GetCurrent() - ? NULL + ? nullptr : GLContext::GetCurrent()->GetGLStateRestorer()), target_(target), old_id_(-1) { |