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

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

Issue 1635973002: Add GL_SAMPLER_CUBE_SHADOW to accepted uniform type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/program_manager.h" 5 #include "gpu/command_buffer/service/program_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 break; 221 break;
222 222
223 case GL_SAMPLER_2D: 223 case GL_SAMPLER_2D:
224 case GL_SAMPLER_2D_RECT_ARB: 224 case GL_SAMPLER_2D_RECT_ARB:
225 case GL_SAMPLER_CUBE: 225 case GL_SAMPLER_CUBE:
226 case GL_SAMPLER_3D_OES: 226 case GL_SAMPLER_3D_OES:
227 case GL_SAMPLER_EXTERNAL_OES: 227 case GL_SAMPLER_EXTERNAL_OES:
228 case GL_SAMPLER_2D_ARRAY: 228 case GL_SAMPLER_2D_ARRAY:
229 case GL_SAMPLER_2D_SHADOW: 229 case GL_SAMPLER_2D_SHADOW:
230 case GL_SAMPLER_2D_ARRAY_SHADOW: 230 case GL_SAMPLER_2D_ARRAY_SHADOW:
231 case GL_SAMPLER_CUBE_SHADOW:
231 case GL_INT_SAMPLER_2D: 232 case GL_INT_SAMPLER_2D:
232 case GL_INT_SAMPLER_3D: 233 case GL_INT_SAMPLER_3D:
233 case GL_INT_SAMPLER_CUBE: 234 case GL_INT_SAMPLER_CUBE:
234 case GL_INT_SAMPLER_2D_ARRAY: 235 case GL_INT_SAMPLER_2D_ARRAY:
235 case GL_UNSIGNED_INT_SAMPLER_2D: 236 case GL_UNSIGNED_INT_SAMPLER_2D:
236 case GL_UNSIGNED_INT_SAMPLER_3D: 237 case GL_UNSIGNED_INT_SAMPLER_3D:
237 case GL_UNSIGNED_INT_SAMPLER_CUBE: 238 case GL_UNSIGNED_INT_SAMPLER_CUBE:
238 case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY: 239 case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
239 accepts_api_type = kUniform1i; 240 accepts_api_type = kUniform1i;
240 break; 241 break;
(...skipping 2142 matching lines...) Expand 10 before | Expand all | Expand 10 after
2383 DCHECK(program); 2384 DCHECK(program);
2384 program->ClearUniforms(&zero_); 2385 program->ClearUniforms(&zero_);
2385 } 2386 }
2386 2387
2387 int32_t ProgramManager::MakeFakeLocation(int32_t index, int32_t element) { 2388 int32_t ProgramManager::MakeFakeLocation(int32_t index, int32_t element) {
2388 return index + element * 0x10000; 2389 return index + element * 0x10000;
2389 } 2390 }
2390 2391
2391 } // namespace gles2 2392 } // namespace gles2
2392 } // namespace gpu 2393 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698