diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h | |
parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
download | qtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h')
-rw-r--r-- | chromium/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h | 39 |
1 files changed, 36 insertions, 3 deletions
diff --git a/chromium/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/chromium/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h index 05d738c98f8..0884f7b8552 100644 --- a/chromium/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h +++ b/chromium/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h @@ -4814,6 +4814,37 @@ error::Error GLES2DecoderImpl::HandleLoseContextCHROMIUM( return error::kNoError; } +error::Error GLES2DecoderImpl::HandleUnpremultiplyAndDitherCopyCHROMIUM( + uint32_t immediate_data_size, + const volatile void* cmd_data) { + const volatile gles2::cmds::UnpremultiplyAndDitherCopyCHROMIUM& c = + *static_cast< + const volatile gles2::cmds::UnpremultiplyAndDitherCopyCHROMIUM*>( + cmd_data); + if (!features().unpremultiply_and_dither_copy) { + return error::kUnknownCommand; + } + + GLuint source_id = static_cast<GLuint>(c.source_id); + GLuint dest_id = static_cast<GLuint>(c.dest_id); + GLint x = static_cast<GLint>(c.x); + GLint y = static_cast<GLint>(c.y); + GLsizei width = static_cast<GLsizei>(c.width); + GLsizei height = static_cast<GLsizei>(c.height); + if (width < 0) { + LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glUnpremultiplyAndDitherCopyCHROMIUM", + "width < 0"); + return error::kNoError; + } + if (height < 0) { + LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glUnpremultiplyAndDitherCopyCHROMIUM", + "height < 0"); + return error::kNoError; + } + DoUnpremultiplyAndDitherCopyCHROMIUM(source_id, dest_id, x, y, width, height); + return error::kNoError; +} + error::Error GLES2DecoderImpl::HandleDrawBuffersEXTImmediate( uint32_t immediate_data_size, const volatile void* cmd_data) { @@ -5150,10 +5181,12 @@ error::Error GLES2DecoderImpl::HandleBeginRasterCHROMIUM( GLboolean can_use_lcd_text = static_cast<GLboolean>(c.can_use_lcd_text); GLboolean use_distance_field_text = static_cast<GLboolean>(c.use_distance_field_text); - GLint pixel_config = static_cast<GLint>(c.pixel_config); + GLint color_type = static_cast<GLint>(c.color_type); + GLuint color_space_transfer_cache_id = + static_cast<GLuint>(c.color_space_transfer_cache_id); DoBeginRasterCHROMIUM(texture_id, sk_color, msaa_sample_count, - can_use_lcd_text, use_distance_field_text, - pixel_config); + can_use_lcd_text, use_distance_field_text, color_type, + color_space_transfer_cache_id); return error::kNoError; } |