diff options
| author | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 20:08:29 +0000 |
|---|---|---|
| committer | sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 20:08:29 +0000 |
| commit | 79dc5b3c55e45c7eeaf5ae962890c4391c562b35 (patch) | |
| tree | 6c3091c51d07c57c430b18aa17f913fce4106d19 /gpu | |
| parent | c32a196d005c9b211625d1249df68caf890d3dbe (diff) | |
| download | chromium_src-79dc5b3c55e45c7eeaf5ae962890c4391c562b35.zip chromium_src-79dc5b3c55e45c7eeaf5ae962890c4391c562b35.tar.gz chromium_src-79dc5b3c55e45c7eeaf5ae962890c4391c562b35.tar.bz2 | |
Add null check in GLES2DecoderImpl::PrepareTexturesForRender()
BUG=265977
R=apatrick@chromium.org
Review URL: https://codereview.chromium.org/21059004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index a3478e9..4f63037 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -5700,7 +5700,8 @@ bool GLES2DecoderImpl::PrepareTexturesForRender() { TextureUnit& texture_unit = state_.texture_units[texture_unit_index]; TextureRef* texture = texture_unit.GetInfoForSamplerType(uniform_info->type).get(); - UpdateStreamTextureIfNeeded(texture->texture()); + if (texture) + UpdateStreamTextureIfNeeded(texture->texture()); if (have_unrenderable_textures && (!texture || !texture_manager()->CanRender(texture))) { textures_set = true; |