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

Side by Side Diff: src/gpu/vk/GrVkPipelineStateDataManager.cpp

Issue 1816153002: Set up cache in vulkan to reuse GrVkPrograms (aka VkPipelines) (Closed) Base URL: https://skia.googlesource.com/skia.git@progSamplers
Patch Set: rebase Created 4 years, 9 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 | « src/gpu/vk/GrVkPipelineStateDataManager.h ('k') | src/gpu/vk/GrVkProgram.h » ('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 2016 Google Inc. 2 * Copyright 2016 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 #include "GrVkProgramDataManager.h" 8 #include "GrVkPipelineStateDataManager.h"
9 9
10 #include "GrVkGpu.h" 10 #include "GrVkGpu.h"
11 #include "GrVkUniformBuffer.h" 11 #include "GrVkUniformBuffer.h"
12 12
13 GrVkProgramDataManager::GrVkProgramDataManager(const UniformInfoArray& uniforms, 13 GrVkPipelineStateDataManager::GrVkPipelineStateDataManager(const UniformInfoArra y& uniforms,
14 uint32_t vertexUniformSize, 14 uint32_t vertexUnifor mSize,
15 uint32_t fragmentUniformSize) 15 uint32_t fragmentUnif ormSize)
16 : fVertexUniformSize(vertexUniformSize) 16 : fVertexUniformSize(vertexUniformSize)
17 , fFragmentUniformSize(fragmentUniformSize) 17 , fFragmentUniformSize(fragmentUniformSize)
18 , fVertexUniformsDirty(false) 18 , fVertexUniformsDirty(false)
19 , fFragmentUniformsDirty(false) { 19 , fFragmentUniformsDirty(false) {
20 fVertexUniformData.reset(vertexUniformSize); 20 fVertexUniformData.reset(vertexUniformSize);
21 fFragmentUniformData.reset(fragmentUniformSize); 21 fFragmentUniformData.reset(fragmentUniformSize);
22 int count = uniforms.count(); 22 int count = uniforms.count();
23 fUniforms.push_back_n(count); 23 fUniforms.push_back_n(count);
24 // We must add uniforms in same order is the UniformInfoArray so that Unifor mHandles already 24 // We must add uniforms in same order is the UniformInfoArray so that Unifor mHandles already
25 // owned by other objects will still match up here. 25 // owned by other objects will still match up here.
26 for (int i = 0; i < count; i++) { 26 for (int i = 0; i < count; i++) {
27 Uniform& uniform = fUniforms[i]; 27 Uniform& uniform = fUniforms[i];
28 const GrVkUniformHandler::UniformInfo uniformInfo = uniforms[i]; 28 const GrVkUniformHandler::UniformInfo uniformInfo = uniforms[i];
29 SkASSERT(GrGLSLShaderVar::kNonArray == uniformInfo.fVariable.getArrayCou nt() || 29 SkASSERT(GrGLSLShaderVar::kNonArray == uniformInfo.fVariable.getArrayCou nt() ||
30 uniformInfo.fVariable.getArrayCount() > 0); 30 uniformInfo.fVariable.getArrayCount() > 0);
31 SkDEBUGCODE( 31 SkDEBUGCODE(
32 uniform.fArrayCount = uniformInfo.fVariable.getArrayCount(); 32 uniform.fArrayCount = uniformInfo.fVariable.getArrayCount();
33 uniform.fType = uniformInfo.fVariable.getType(); 33 uniform.fType = uniformInfo.fVariable.getType();
34 ); 34 );
35 uniform.fBinding = uniformInfo.fBinding; 35 uniform.fBinding = uniformInfo.fBinding;
36 uniform.fOffset = uniformInfo.fUBOffset; 36 uniform.fOffset = uniformInfo.fUBOffset;
37 SkDEBUGCODE( 37 SkDEBUGCODE(
38 uniform.fSetNumber = uniformInfo.fSetNumber; 38 uniform.fSetNumber = uniformInfo.fSetNumber;
39 ); 39 );
40 } 40 }
41 } 41 }
42 42
43 void* GrVkProgramDataManager::getBufferPtrAndMarkDirty(const Uniform& uni) const { 43 void* GrVkPipelineStateDataManager::getBufferPtrAndMarkDirty(const Uniform& uni) const {
44 void* buffer; 44 void* buffer;
45 if (GrVkUniformHandler::kVertexBinding == uni.fBinding) { 45 if (GrVkUniformHandler::kVertexBinding == uni.fBinding) {
46 buffer = fVertexUniformData.get(); 46 buffer = fVertexUniformData.get();
47 fVertexUniformsDirty = true; 47 fVertexUniformsDirty = true;
48 } 48 }
49 else { 49 else {
50 SkASSERT(GrVkUniformHandler::kFragBinding == uni.fBinding); 50 SkASSERT(GrVkUniformHandler::kFragBinding == uni.fBinding);
51 buffer = fFragmentUniformData.get(); 51 buffer = fFragmentUniformData.get();
52 fFragmentUniformsDirty = true; 52 fFragmentUniformsDirty = true;
53 } 53 }
54 buffer = static_cast<char*>(buffer)+uni.fOffset; 54 buffer = static_cast<char*>(buffer)+uni.fOffset;
55 return buffer; 55 return buffer;
56 } 56 }
57 57
58 void GrVkProgramDataManager::set1f(UniformHandle u, float v0) const { 58 void GrVkPipelineStateDataManager::set1f(UniformHandle u, float v0) const {
59 const Uniform& uni = fUniforms[u.toIndex()]; 59 const Uniform& uni = fUniforms[u.toIndex()];
60 SkASSERT(uni.fType == kFloat_GrSLType); 60 SkASSERT(uni.fType == kFloat_GrSLType);
61 SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount); 61 SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
62 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber); 62 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber);
63 void* buffer = this->getBufferPtrAndMarkDirty(uni); 63 void* buffer = this->getBufferPtrAndMarkDirty(uni);
64 SkASSERT(sizeof(float) == 4); 64 SkASSERT(sizeof(float) == 4);
65 memcpy(buffer, &v0, sizeof(float)); 65 memcpy(buffer, &v0, sizeof(float));
66 } 66 }
67 67
68 void GrVkProgramDataManager::set1fv(UniformHandle u, 68 void GrVkPipelineStateDataManager::set1fv(UniformHandle u,
69 int arrayCount, 69 int arrayCount,
70 const float v[]) const { 70 const float v[]) const {
71 const Uniform& uni = fUniforms[u.toIndex()]; 71 const Uniform& uni = fUniforms[u.toIndex()];
72 SkASSERT(uni.fType == kFloat_GrSLType); 72 SkASSERT(uni.fType == kFloat_GrSLType);
73 SkASSERT(arrayCount > 0); 73 SkASSERT(arrayCount > 0);
74 SkASSERT(arrayCount <= uni.fArrayCount || 74 SkASSERT(arrayCount <= uni.fArrayCount ||
75 (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount)) ; 75 (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount)) ;
76 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber); 76 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber);
77 77
78 void* buffer = this->getBufferPtrAndMarkDirty(uni); 78 void* buffer = this->getBufferPtrAndMarkDirty(uni);
79 SkASSERT(sizeof(float) == 4); 79 SkASSERT(sizeof(float) == 4);
80 for (int i = 0; i < arrayCount; ++i) { 80 for (int i = 0; i < arrayCount; ++i) {
81 const float* curVec = &v[i]; 81 const float* curVec = &v[i];
82 memcpy(buffer, curVec, sizeof(float)); 82 memcpy(buffer, curVec, sizeof(float));
83 buffer = static_cast<char*>(buffer) + 4*sizeof(float); 83 buffer = static_cast<char*>(buffer) + 4*sizeof(float);
84 } 84 }
85 } 85 }
86 86
87 void GrVkProgramDataManager::set2f(UniformHandle u, float v0, float v1) const { 87 void GrVkPipelineStateDataManager::set2f(UniformHandle u, float v0, float v1) co nst {
88 const Uniform& uni = fUniforms[u.toIndex()]; 88 const Uniform& uni = fUniforms[u.toIndex()];
89 SkASSERT(uni.fType == kVec2f_GrSLType); 89 SkASSERT(uni.fType == kVec2f_GrSLType);
90 SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount); 90 SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
91 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber); 91 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber);
92 void* buffer = this->getBufferPtrAndMarkDirty(uni); 92 void* buffer = this->getBufferPtrAndMarkDirty(uni);
93 SkASSERT(sizeof(float) == 4); 93 SkASSERT(sizeof(float) == 4);
94 float v[2] = { v0, v1 }; 94 float v[2] = { v0, v1 };
95 memcpy(buffer, v, 2 * sizeof(float)); 95 memcpy(buffer, v, 2 * sizeof(float));
96 } 96 }
97 97
98 void GrVkProgramDataManager::set2fv(UniformHandle u, 98 void GrVkPipelineStateDataManager::set2fv(UniformHandle u,
99 int arrayCount, 99 int arrayCount,
100 const float v[]) const { 100 const float v[]) const {
101 const Uniform& uni = fUniforms[u.toIndex()]; 101 const Uniform& uni = fUniforms[u.toIndex()];
102 SkASSERT(uni.fType == kVec2f_GrSLType); 102 SkASSERT(uni.fType == kVec2f_GrSLType);
103 SkASSERT(arrayCount > 0); 103 SkASSERT(arrayCount > 0);
104 SkASSERT(arrayCount <= uni.fArrayCount || 104 SkASSERT(arrayCount <= uni.fArrayCount ||
105 (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount)) ; 105 (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount)) ;
106 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber); 106 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber);
107 107
108 void* buffer = this->getBufferPtrAndMarkDirty(uni); 108 void* buffer = this->getBufferPtrAndMarkDirty(uni);
109 SkASSERT(sizeof(float) == 4); 109 SkASSERT(sizeof(float) == 4);
110 for (int i = 0; i < arrayCount; ++i) { 110 for (int i = 0; i < arrayCount; ++i) {
111 const float* curVec = &v[2 * i]; 111 const float* curVec = &v[2 * i];
112 memcpy(buffer, curVec, 2 * sizeof(float)); 112 memcpy(buffer, curVec, 2 * sizeof(float));
113 buffer = static_cast<char*>(buffer) + 4*sizeof(float); 113 buffer = static_cast<char*>(buffer) + 4*sizeof(float);
114 } 114 }
115 } 115 }
116 116
117 void GrVkProgramDataManager::set3f(UniformHandle u, float v0, float v1, float v2 ) const { 117 void GrVkPipelineStateDataManager::set3f(UniformHandle u, float v0, float v1, fl oat v2) const {
118 const Uniform& uni = fUniforms[u.toIndex()]; 118 const Uniform& uni = fUniforms[u.toIndex()];
119 SkASSERT(uni.fType == kVec3f_GrSLType); 119 SkASSERT(uni.fType == kVec3f_GrSLType);
120 SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount); 120 SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
121 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber); 121 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber);
122 void* buffer = this->getBufferPtrAndMarkDirty(uni); 122 void* buffer = this->getBufferPtrAndMarkDirty(uni);
123 SkASSERT(sizeof(float) == 4); 123 SkASSERT(sizeof(float) == 4);
124 float v[3] = { v0, v1, v2 }; 124 float v[3] = { v0, v1, v2 };
125 memcpy(buffer, v, 3 * sizeof(float)); 125 memcpy(buffer, v, 3 * sizeof(float));
126 } 126 }
127 127
128 void GrVkProgramDataManager::set3fv(UniformHandle u, 128 void GrVkPipelineStateDataManager::set3fv(UniformHandle u,
129 int arrayCount, 129 int arrayCount,
130 const float v[]) const { 130 const float v[]) const {
131 const Uniform& uni = fUniforms[u.toIndex()]; 131 const Uniform& uni = fUniforms[u.toIndex()];
132 SkASSERT(uni.fType == kVec3f_GrSLType); 132 SkASSERT(uni.fType == kVec3f_GrSLType);
133 SkASSERT(arrayCount > 0); 133 SkASSERT(arrayCount > 0);
134 SkASSERT(arrayCount <= uni.fArrayCount || 134 SkASSERT(arrayCount <= uni.fArrayCount ||
135 (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount)) ; 135 (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount)) ;
136 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber); 136 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber);
137 137
138 void* buffer = this->getBufferPtrAndMarkDirty(uni); 138 void* buffer = this->getBufferPtrAndMarkDirty(uni);
139 SkASSERT(sizeof(float) == 4); 139 SkASSERT(sizeof(float) == 4);
140 for (int i = 0; i < arrayCount; ++i) { 140 for (int i = 0; i < arrayCount; ++i) {
141 const float* curVec = &v[3 * i]; 141 const float* curVec = &v[3 * i];
142 memcpy(buffer, curVec, 3 * sizeof(float)); 142 memcpy(buffer, curVec, 3 * sizeof(float));
143 buffer = static_cast<char*>(buffer) + 4*sizeof(float); 143 buffer = static_cast<char*>(buffer) + 4*sizeof(float);
144 } 144 }
145 } 145 }
146 146
147 void GrVkProgramDataManager::set4f(UniformHandle u, float v0, float v1, float v2 , float v3) const { 147 void GrVkPipelineStateDataManager::set4f(UniformHandle u,
148 float v0,
149 float v1,
150 float v2,
151 float v3) const {
148 const Uniform& uni = fUniforms[u.toIndex()]; 152 const Uniform& uni = fUniforms[u.toIndex()];
149 SkASSERT(uni.fType == kVec4f_GrSLType); 153 SkASSERT(uni.fType == kVec4f_GrSLType);
150 SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount); 154 SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
151 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber); 155 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber);
152 void* buffer = this->getBufferPtrAndMarkDirty(uni); 156 void* buffer = this->getBufferPtrAndMarkDirty(uni);
153 SkASSERT(sizeof(float) == 4); 157 SkASSERT(sizeof(float) == 4);
154 float v[4] = { v0, v1, v2, v3 }; 158 float v[4] = { v0, v1, v2, v3 };
155 memcpy(buffer, v, 4 * sizeof(float)); 159 memcpy(buffer, v, 4 * sizeof(float));
156 } 160 }
157 161
158 void GrVkProgramDataManager::set4fv(UniformHandle u, 162 void GrVkPipelineStateDataManager::set4fv(UniformHandle u,
159 int arrayCount, 163 int arrayCount,
160 const float v[]) const { 164 const float v[]) const {
161 const Uniform& uni = fUniforms[u.toIndex()]; 165 const Uniform& uni = fUniforms[u.toIndex()];
162 SkASSERT(uni.fType == kVec4f_GrSLType); 166 SkASSERT(uni.fType == kVec4f_GrSLType);
163 SkASSERT(arrayCount > 0); 167 SkASSERT(arrayCount > 0);
164 SkASSERT(arrayCount <= uni.fArrayCount || 168 SkASSERT(arrayCount <= uni.fArrayCount ||
165 (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount)) ; 169 (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount)) ;
166 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber); 170 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber);
167 171
168 void* buffer = this->getBufferPtrAndMarkDirty(uni); 172 void* buffer = this->getBufferPtrAndMarkDirty(uni);
169 SkASSERT(sizeof(float) == 4); 173 SkASSERT(sizeof(float) == 4);
170 memcpy(buffer, v, arrayCount * 4 * sizeof(float)); 174 memcpy(buffer, v, arrayCount * 4 * sizeof(float));
171 } 175 }
172 176
173 void GrVkProgramDataManager::setMatrix2f(UniformHandle u, const float matrix[]) const { 177 void GrVkPipelineStateDataManager::setMatrix2f(UniformHandle u, const float matr ix[]) const {
174 this->setMatrices<2>(u, 1, matrix); 178 this->setMatrices<2>(u, 1, matrix);
175 } 179 }
176 180
177 void GrVkProgramDataManager::setMatrix2fv(UniformHandle u, int arrayCount, const float m[]) const { 181 void GrVkPipelineStateDataManager::setMatrix2fv(UniformHandle u,
182 int arrayCount,
183 const float m[]) const {
178 this->setMatrices<2>(u, arrayCount, m); 184 this->setMatrices<2>(u, arrayCount, m);
179 } 185 }
180 186
181 void GrVkProgramDataManager::setMatrix3f(UniformHandle u, const float matrix[]) const { 187 void GrVkPipelineStateDataManager::setMatrix3f(UniformHandle u, const float matr ix[]) const {
182 this->setMatrices<3>(u, 1, matrix); 188 this->setMatrices<3>(u, 1, matrix);
183 } 189 }
184 190
185 void GrVkProgramDataManager::setMatrix3fv(UniformHandle u, int arrayCount, const float m[]) const { 191 void GrVkPipelineStateDataManager::setMatrix3fv(UniformHandle u,
192 int arrayCount,
193 const float m[]) const {
186 this->setMatrices<3>(u, arrayCount, m); 194 this->setMatrices<3>(u, arrayCount, m);
187 } 195 }
188 196
189 void GrVkProgramDataManager::setMatrix4f(UniformHandle u, const float matrix[]) const { 197 void GrVkPipelineStateDataManager::setMatrix4f(UniformHandle u, const float matr ix[]) const {
190 this->setMatrices<4>(u, 1, matrix); 198 this->setMatrices<4>(u, 1, matrix);
191 } 199 }
192 200
193 void GrVkProgramDataManager::setMatrix4fv(UniformHandle u, int arrayCount, const float m[]) const { 201 void GrVkPipelineStateDataManager::setMatrix4fv(UniformHandle u,
202 int arrayCount,
203 const float m[]) const {
194 this->setMatrices<4>(u, arrayCount, m); 204 this->setMatrices<4>(u, arrayCount, m);
195 } 205 }
196 206
197 template<int N> struct set_uniform_matrix; 207 template<int N> struct set_uniform_matrix;
198 208
199 template<int N> inline void GrVkProgramDataManager::setMatrices(UniformHandle u, 209 template<int N> inline void GrVkPipelineStateDataManager::setMatrices(UniformHan dle u,
200 int arrayCount, 210 int arrayC ount,
201 const float matr ices[]) const { 211 const float matrices[]) const {
202 const Uniform& uni = fUniforms[u.toIndex()]; 212 const Uniform& uni = fUniforms[u.toIndex()];
203 SkASSERT(uni.fType == kMat22f_GrSLType + (N - 2)); 213 SkASSERT(uni.fType == kMat22f_GrSLType + (N - 2));
204 SkASSERT(arrayCount > 0); 214 SkASSERT(arrayCount > 0);
205 SkASSERT(arrayCount <= uni.fArrayCount || 215 SkASSERT(arrayCount <= uni.fArrayCount ||
206 (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount)) ; 216 (1 == arrayCount && GrGLSLShaderVar::kNonArray == uni.fArrayCount)) ;
207 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber); 217 SkASSERT(GrVkUniformHandler::kUniformBufferDescSet == uni.fSetNumber);
208 218
209 void* buffer; 219 void* buffer;
210 if (GrVkUniformHandler::kVertexBinding == uni.fBinding) { 220 if (GrVkUniformHandler::kVertexBinding == uni.fBinding) {
211 buffer = fVertexUniformData.get(); 221 buffer = fVertexUniformData.get();
(...skipping 24 matching lines...) Expand all
236 }; 246 };
237 247
238 template<> struct set_uniform_matrix<4> { 248 template<> struct set_uniform_matrix<4> {
239 inline static void set(void* buffer, int uniformOffset, int count, const flo at matrices[]) { 249 inline static void set(void* buffer, int uniformOffset, int count, const flo at matrices[]) {
240 GR_STATIC_ASSERT(sizeof(float) == 4); 250 GR_STATIC_ASSERT(sizeof(float) == 4);
241 buffer = static_cast<char*>(buffer) + uniformOffset; 251 buffer = static_cast<char*>(buffer) + uniformOffset;
242 memcpy(buffer, matrices, count * 16 * sizeof(float)); 252 memcpy(buffer, matrices, count * 16 * sizeof(float));
243 } 253 }
244 }; 254 };
245 255
246 void GrVkProgramDataManager::uploadUniformBuffers(const GrVkGpu* gpu, 256 void GrVkPipelineStateDataManager::uploadUniformBuffers(const GrVkGpu* gpu,
247 GrVkUniformBuffer* vertexBuffe r, 257 GrVkUniformBuffer* verte xBuffer,
248 GrVkUniformBuffer* fragmentBuf fer) const { 258 GrVkUniformBuffer* fragm entBuffer) const {
249 if (vertexBuffer && fVertexUniformsDirty) { 259 if (vertexBuffer && fVertexUniformsDirty) {
250 vertexBuffer->addMemoryBarrier(gpu, 260 vertexBuffer->addMemoryBarrier(gpu,
251 VK_ACCESS_UNIFORM_READ_BIT, 261 VK_ACCESS_UNIFORM_READ_BIT,
252 VK_ACCESS_HOST_WRITE_BIT, 262 VK_ACCESS_HOST_WRITE_BIT,
253 VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, 263 VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
254 VK_PIPELINE_STAGE_HOST_BIT, 264 VK_PIPELINE_STAGE_HOST_BIT,
255 false); 265 false);
256 SkAssertResult(vertexBuffer->updateData(gpu, fVertexUniformData.get(), f VertexUniformSize)); 266 SkAssertResult(vertexBuffer->updateData(gpu, fVertexUniformData.get(), f VertexUniformSize));
257 fVertexUniformsDirty = false; 267 fVertexUniformsDirty = false;
258 } 268 }
259 269
260 if (fragmentBuffer && fFragmentUniformsDirty) { 270 if (fragmentBuffer && fFragmentUniformsDirty) {
261 fragmentBuffer->addMemoryBarrier(gpu, 271 fragmentBuffer->addMemoryBarrier(gpu,
262 VK_ACCESS_UNIFORM_READ_BIT, 272 VK_ACCESS_UNIFORM_READ_BIT,
263 VK_ACCESS_HOST_WRITE_BIT, 273 VK_ACCESS_HOST_WRITE_BIT,
264 VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 274 VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
265 VK_PIPELINE_STAGE_HOST_BIT, 275 VK_PIPELINE_STAGE_HOST_BIT,
266 false); 276 false);
267 SkAssertResult(fragmentBuffer->updateData(gpu, fFragmentUniformData.get( ), 277 SkAssertResult(fragmentBuffer->updateData(gpu, fFragmentUniformData.get( ),
268 fFragmentUniformSize)); 278 fFragmentUniformSize));
269 fFragmentUniformsDirty = false; 279 fFragmentUniformsDirty = false;
270 } 280 }
271 } 281 }
272 282
OLDNEW
« no previous file with comments | « src/gpu/vk/GrVkPipelineStateDataManager.h ('k') | src/gpu/vk/GrVkProgram.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698