| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" | 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
| 6 | 6 |
| 7 #include <stdio.h> | 7 #include <stdio.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <cmath> | 10 #include <cmath> |
| (...skipping 7140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 7151 GLenum textarget = GetBindTargetForSamplerType(uniform_info->type); | 7151 GLenum textarget = GetBindTargetForSamplerType(uniform_info->type); |
| 7152 if (!texture_ref || !texture_manager()->CanRender(texture_ref)) { | 7152 if (!texture_ref || !texture_manager()->CanRender(texture_ref)) { |
| 7153 textures_set = true; | 7153 textures_set = true; |
| 7154 glActiveTexture(GL_TEXTURE0 + texture_unit_index); | 7154 glActiveTexture(GL_TEXTURE0 + texture_unit_index); |
| 7155 glBindTexture( | 7155 glBindTexture( |
| 7156 textarget, | 7156 textarget, |
| 7157 texture_manager()->black_texture_id(uniform_info->type)); | 7157 texture_manager()->black_texture_id(uniform_info->type)); |
| 7158 if (!texture_ref) { | 7158 if (!texture_ref) { |
| 7159 LOCAL_RENDER_WARNING( | 7159 LOCAL_RENDER_WARNING( |
| 7160 std::string("there is no texture bound to the unit ") + | 7160 std::string("there is no texture bound to the unit ") + |
| 7161 base::IntToString(texture_unit_index)); | 7161 base::UintToString(texture_unit_index)); |
| 7162 } else { | 7162 } else { |
| 7163 LOCAL_RENDER_WARNING( | 7163 LOCAL_RENDER_WARNING( |
| 7164 std::string("texture bound to texture unit ") + | 7164 std::string("texture bound to texture unit ") + |
| 7165 base::IntToString(texture_unit_index) + | 7165 base::UintToString(texture_unit_index) + |
| 7166 " is not renderable. It maybe non-power-of-2 and have" | 7166 " is not renderable. It maybe non-power-of-2 and have" |
| 7167 " incompatible texture filtering."); | 7167 " incompatible texture filtering."); |
| 7168 } | 7168 } |
| 7169 continue; | 7169 continue; |
| 7170 } | 7170 } |
| 7171 | 7171 |
| 7172 if (textarget != GL_TEXTURE_CUBE_MAP) { | 7172 if (textarget != GL_TEXTURE_CUBE_MAP) { |
| 7173 Texture* texture = texture_ref->texture(); | 7173 Texture* texture = texture_ref->texture(); |
| 7174 gfx::GLImage* image = texture->GetLevelImage(textarget, 0); | 7174 gfx::GLImage* image = texture->GetLevelImage(textarget, 0); |
| 7175 if (image && !texture->IsAttachedToFramebuffer()) { | 7175 if (image && !texture->IsAttachedToFramebuffer()) { |
| (...skipping 7491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 14667 return error::kNoError; | 14667 return error::kNoError; |
| 14668 } | 14668 } |
| 14669 | 14669 |
| 14670 // Include the auto-generated part of this file. We split this because it means | 14670 // Include the auto-generated part of this file. We split this because it means |
| 14671 // we can easily edit the non-auto generated parts right here in this file | 14671 // we can easily edit the non-auto generated parts right here in this file |
| 14672 // instead of having to edit some template or the code generator. | 14672 // instead of having to edit some template or the code generator. |
| 14673 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" | 14673 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" |
| 14674 | 14674 |
| 14675 } // namespace gles2 | 14675 } // namespace gles2 |
| 14676 } // namespace gpu | 14676 } // namespace gpu |
| OLD | NEW |