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 7043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7054 return false; | 7054 return false; |
7055 } | 7055 } |
7056 return true; | 7056 return true; |
7057 } | 7057 } |
7058 | 7058 |
7059 bool GLES2DecoderImpl::CheckCurrentProgramForUniform( | 7059 bool GLES2DecoderImpl::CheckCurrentProgramForUniform( |
7060 GLint location, const char* function_name) { | 7060 GLint location, const char* function_name) { |
7061 if (!CheckCurrentProgram(function_name)) { | 7061 if (!CheckCurrentProgram(function_name)) { |
7062 return false; | 7062 return false; |
7063 } | 7063 } |
7064 return location != -1; | 7064 return !state_.current_program->IsInactiveUniformLocationByFakeLocation( |
| 7065 location); |
7065 } | 7066 } |
7066 | 7067 |
7067 bool GLES2DecoderImpl::CheckDrawingFeedbackLoops() { | 7068 bool GLES2DecoderImpl::CheckDrawingFeedbackLoops() { |
7068 Framebuffer* framebuffer = GetFramebufferInfoForTarget(GL_FRAMEBUFFER); | 7069 Framebuffer* framebuffer = GetFramebufferInfoForTarget(GL_FRAMEBUFFER); |
7069 if (!framebuffer) | 7070 if (!framebuffer) |
7070 return false; | 7071 return false; |
7071 const Framebuffer::Attachment* attachment = | 7072 const Framebuffer::Attachment* attachment = |
7072 framebuffer->GetAttachment(GL_COLOR_ATTACHMENT0); | 7073 framebuffer->GetAttachment(GL_COLOR_ATTACHMENT0); |
7073 if (!attachment) | 7074 if (!attachment) |
7074 return false; | 7075 return false; |
(...skipping 8454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
15529 return error::kNoError; | 15530 return error::kNoError; |
15530 } | 15531 } |
15531 | 15532 |
15532 // Include the auto-generated part of this file. We split this because it means | 15533 // Include the auto-generated part of this file. We split this because it means |
15533 // we can easily edit the non-auto generated parts right here in this file | 15534 // we can easily edit the non-auto generated parts right here in this file |
15534 // instead of having to edit some template or the code generator. | 15535 // instead of having to edit some template or the code generator. |
15535 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" | 15536 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" |
15536 | 15537 |
15537 } // namespace gles2 | 15538 } // namespace gles2 |
15538 } // namespace gpu | 15539 } // namespace gpu |
OLD | NEW |