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

Side by Side Diff: src/gpu/gl/GrGLProgramDataManager.h

Issue 2080133002: Revert of Integers can now be passed as uniforms (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 6 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 | src/gpu/gl/GrGLProgramDataManager.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef GrGLProgramDataManager_DEFINED 8 #ifndef GrGLProgramDataManager_DEFINED
9 #define GrGLProgramDataManager_DEFINED 9 #define GrGLProgramDataManager_DEFINED
10 10
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 GrGLProgramDataManager(GrGLGpu*, GrGLuint programID, const UniformInfoArray& , 47 GrGLProgramDataManager(GrGLGpu*, GrGLuint programID, const UniformInfoArray& ,
48 const VaryingInfoArray&); 48 const VaryingInfoArray&);
49 49
50 50
51 void setSamplers(const SkTArray<GrGLSampler>& samplers) const; 51 void setSamplers(const SkTArray<GrGLSampler>& samplers) const;
52 52
53 /** Functions for uploading uniform values. The varities ending in v can be used to upload to an 53 /** Functions for uploading uniform values. The varities ending in v can be used to upload to an
54 * array of uniforms. arrayCount must be <= the array count of the uniform. 54 * array of uniforms. arrayCount must be <= the array count of the uniform.
55 */ 55 */
56 void set1i(UniformHandle, int) const override;
57 void set1f(UniformHandle, float v0) const override; 56 void set1f(UniformHandle, float v0) const override;
58 void set1fv(UniformHandle, int arrayCount, const float v[]) const override; 57 void set1fv(UniformHandle, int arrayCount, const float v[]) const override;
59 void set2f(UniformHandle, float, float) const override; 58 void set2f(UniformHandle, float, float) const override;
60 void set2fv(UniformHandle, int arrayCount, const float v[]) const override; 59 void set2fv(UniformHandle, int arrayCount, const float v[]) const override;
61 void set3f(UniformHandle, float, float, float) const override; 60 void set3f(UniformHandle, float, float, float) const override;
62 void set3fv(UniformHandle, int arrayCount, const float v[]) const override; 61 void set3fv(UniformHandle, int arrayCount, const float v[]) const override;
63 void set4f(UniformHandle, float, float, float, float) const override; 62 void set4f(UniformHandle, float, float, float, float) const override;
64 void set4fv(UniformHandle, int arrayCount, const float v[]) const override; 63 void set4fv(UniformHandle, int arrayCount, const float v[]) const override;
65 // matrices are column-major, the first three upload a single matrix, the la tter three upload 64 // matrices are column-major, the first three upload a single matrix, the la tter three upload
66 // arrayCount matrices into a uniform array. 65 // arrayCount matrices into a uniform array.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 106
108 SkTArray<Uniform, true> fUniforms; 107 SkTArray<Uniform, true> fUniforms;
109 SkTArray<PathProcVarying, true> fPathProcVaryings; 108 SkTArray<PathProcVarying, true> fPathProcVaryings;
110 GrGLGpu* fGpu; 109 GrGLGpu* fGpu;
111 GrGLuint fProgramID; 110 GrGLuint fProgramID;
112 111
113 typedef GrGLSLProgramDataManager INHERITED; 112 typedef GrGLSLProgramDataManager INHERITED;
114 }; 113 };
115 114
116 #endif 115 #endif
OLDNEW
« no previous file with comments | « no previous file | src/gpu/gl/GrGLProgramDataManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698