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

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

Issue 1349793004: Get LinkProgram to work with int/uint sampler variables. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 <algorithm> 7 #include <algorithm>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 case GL_FLOAT_MAT4x3: 211 case GL_FLOAT_MAT4x3:
212 accepts_api_type = kUniformMatrix4x3f; 212 accepts_api_type = kUniformMatrix4x3f;
213 break; 213 break;
214 214
215 case GL_SAMPLER_2D: 215 case GL_SAMPLER_2D:
216 case GL_SAMPLER_2D_RECT_ARB: 216 case GL_SAMPLER_2D_RECT_ARB:
217 case GL_SAMPLER_CUBE: 217 case GL_SAMPLER_CUBE:
218 case GL_SAMPLER_3D_OES: 218 case GL_SAMPLER_3D_OES:
219 case GL_SAMPLER_EXTERNAL_OES: 219 case GL_SAMPLER_EXTERNAL_OES:
220 case GL_SAMPLER_2D_ARRAY: 220 case GL_SAMPLER_2D_ARRAY:
221 case GL_SAMPLER_2D_SHADOW:
222 case GL_SAMPLER_2D_ARRAY_SHADOW:
223 case GL_INT_SAMPLER_2D:
224 case GL_INT_SAMPLER_3D:
225 case GL_INT_SAMPLER_CUBE:
226 case GL_INT_SAMPLER_2D_ARRAY:
227 case GL_UNSIGNED_INT_SAMPLER_2D:
228 case GL_UNSIGNED_INT_SAMPLER_3D:
229 case GL_UNSIGNED_INT_SAMPLER_CUBE:
230 case GL_UNSIGNED_INT_SAMPLER_2D_ARRAY:
221 accepts_api_type = kUniform1i; 231 accepts_api_type = kUniform1i;
222 break; 232 break;
223 233
224 default: 234 default:
225 NOTREACHED() << "Unhandled UniformInfo type " << type; 235 NOTREACHED() << "Unhandled UniformInfo type " << type;
226 break; 236 break;
227 } 237 }
228 } 238 }
229 239
230 Program::UniformInfo::~UniformInfo() {} 240 Program::UniformInfo::~UniformInfo() {}
(...skipping 1698 matching lines...) Expand 10 before | Expand all | Expand 10 after
1929 DCHECK(program); 1939 DCHECK(program);
1930 program->ClearUniforms(&zero_); 1940 program->ClearUniforms(&zero_);
1931 } 1941 }
1932 1942
1933 int32 ProgramManager::MakeFakeLocation(int32 index, int32 element) { 1943 int32 ProgramManager::MakeFakeLocation(int32 index, int32 element) {
1934 return index + element * 0x10000; 1944 return index + element * 0x10000;
1935 } 1945 }
1936 1946
1937 } // namespace gles2 1947 } // namespace gles2
1938 } // namespace gpu 1948 } // 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