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 <list> | 10 #include <list> |
(...skipping 3572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3583 } | 3583 } |
3584 if (result == error::kNoError && current_decoder_error_ != error::kNoError) { | 3584 if (result == error::kNoError && current_decoder_error_ != error::kNoError) { |
3585 result = current_decoder_error_; | 3585 result = current_decoder_error_; |
3586 current_decoder_error_ = error::kNoError; | 3586 current_decoder_error_ = error::kNoError; |
3587 } | 3587 } |
3588 return result; | 3588 return result; |
3589 } | 3589 } |
3590 | 3590 |
3591 void GLES2DecoderImpl::RemoveBuffer(GLuint client_id) { | 3591 void GLES2DecoderImpl::RemoveBuffer(GLuint client_id) { |
3592 buffer_manager()->RemoveBuffer(client_id); | 3592 buffer_manager()->RemoveBuffer(client_id); |
| 3593 image_manager()->RemoveImage(client_id); |
3593 } | 3594 } |
3594 | 3595 |
3595 bool GLES2DecoderImpl::CreateProgramHelper(GLuint client_id) { | 3596 bool GLES2DecoderImpl::CreateProgramHelper(GLuint client_id) { |
3596 if (GetProgram(client_id)) { | 3597 if (GetProgram(client_id)) { |
3597 return false; | 3598 return false; |
3598 } | 3599 } |
3599 GLuint service_id = glCreateProgram(); | 3600 GLuint service_id = glCreateProgram(); |
3600 if (service_id != 0) { | 3601 if (service_id != 0) { |
3601 CreateProgram(client_id, service_id); | 3602 CreateProgram(client_id, service_id); |
3602 } | 3603 } |
(...skipping 6807 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
10410 return error::kNoError; | 10411 return error::kNoError; |
10411 } | 10412 } |
10412 | 10413 |
10413 // Include the auto-generated part of this file. We split this because it means | 10414 // Include the auto-generated part of this file. We split this because it means |
10414 // we can easily edit the non-auto generated parts right here in this file | 10415 // we can easily edit the non-auto generated parts right here in this file |
10415 // instead of having to edit some template or the code generator. | 10416 // instead of having to edit some template or the code generator. |
10416 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" | 10417 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" |
10417 | 10418 |
10418 } // namespace gles2 | 10419 } // namespace gles2 |
10419 } // namespace gpu | 10420 } // namespace gpu |
OLD | NEW |