Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 1419393005: command_buffer: Make inactive bound uniforms reserve the location (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 7038 matching lines...) Expand 10 before | Expand all | Expand 10 after
7049 return false; 7049 return false;
7050 } 7050 }
7051 return true; 7051 return true;
7052 } 7052 }
7053 7053
7054 bool GLES2DecoderImpl::CheckCurrentProgramForUniform( 7054 bool GLES2DecoderImpl::CheckCurrentProgramForUniform(
7055 GLint location, const char* function_name) { 7055 GLint location, const char* function_name) {
7056 if (!CheckCurrentProgram(function_name)) { 7056 if (!CheckCurrentProgram(function_name)) {
7057 return false; 7057 return false;
7058 } 7058 }
7059 return location != -1; 7059 return !state_.current_program->IsInactiveUniformLocationByFakeLocation(
7060 location);
7060 } 7061 }
7061 7062
7062 bool GLES2DecoderImpl::CheckDrawingFeedbackLoops() { 7063 bool GLES2DecoderImpl::CheckDrawingFeedbackLoops() {
7063 Framebuffer* framebuffer = GetFramebufferInfoForTarget(GL_FRAMEBUFFER); 7064 Framebuffer* framebuffer = GetFramebufferInfoForTarget(GL_FRAMEBUFFER);
7064 if (!framebuffer) 7065 if (!framebuffer)
7065 return false; 7066 return false;
7066 const Framebuffer::Attachment* attachment = 7067 const Framebuffer::Attachment* attachment =
7067 framebuffer->GetAttachment(GL_COLOR_ATTACHMENT0); 7068 framebuffer->GetAttachment(GL_COLOR_ATTACHMENT0);
7068 if (!attachment) 7069 if (!attachment)
7069 return false; 7070 return false;
(...skipping 8530 matching lines...) Expand 10 before | Expand all | Expand 10 after
15600 return error::kNoError; 15601 return error::kNoError;
15601 } 15602 }
15602 15603
15603 // Include the auto-generated part of this file. We split this because it means 15604 // Include the auto-generated part of this file. We split this because it means
15604 // we can easily edit the non-auto generated parts right here in this file 15605 // we can easily edit the non-auto generated parts right here in this file
15605 // instead of having to edit some template or the code generator. 15606 // instead of having to edit some template or the code generator.
15606 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 15607 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
15607 15608
15608 } // namespace gles2 15609 } // namespace gles2
15609 } // namespace gpu 15610 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698