diff options
| author | martina.kollarova <martina.kollarova@intel.com> | 2016-02-26 03:01:10 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-26 11:02:39 +0000 |
| commit | ab30699eb1fb791f448ed6449b49677670876a57 (patch) | |
| tree | 6f63c299c50fb2b339b896f20bc032ea0cab63d5 /gpu | |
| parent | c0cce2c0c7beaa0793942997754b62d9f1f6cdb1 (diff) | |
| download | chromium_src-ab30699eb1fb791f448ed6449b49677670876a57.zip chromium_src-ab30699eb1fb791f448ed6449b49677670876a57.tar.gz chromium_src-ab30699eb1fb791f448ed6449b49677670876a57.tar.bz2 | |
Fix segfault in gpu_timing
The extension GL_ARB_timer_query depends on GL 3.2, expecting that
glGetInteger64v is available.
BUG=583656
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
Review URL: https://codereview.chromium.org/1679163003
Cr-Commit-Position: refs/heads/master@{#377866}
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc index e2ecece..5c1e048 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc @@ -1011,7 +1011,7 @@ TEST_P(GLES2DecoderManualInitTest, BeginInvalidTargetQueryFails) { TEST_P(GLES2DecoderManualInitTest, QueryCounterEXTTimeStamp) { InitState init; init.extensions = "GL_ARB_timer_query"; - init.gl_version = "opengl 2.0"; + init.gl_version = "opengl es 3.0"; init.has_alpha = true; init.request_alpha = true; init.bind_generates_resource = true; |