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

Unified Diff: src/gpu/vk/GrVkGpuCommandBuffer.cpp

Issue 2118733005: Fix vulkan image sampling (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove debug 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 side-by-side diff with in-line comments
Download patch
Index: src/gpu/vk/GrVkGpuCommandBuffer.cpp
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
index 6c966b5fa941144b13f247c752bb089933b97764..2eb16712692b3dddf53454e0d1b01c09e188ea19 100644
--- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp
+++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
@@ -371,6 +371,12 @@ void GrVkGpuCommandBuffer::onDraw(const GrPipeline& pipeline,
const GrVkRenderPass* renderPass = vkRT->simpleRenderPass();
SkASSERT(renderPass);
+ append_sampled_images(primProc, fGpu, &fSampledImages);
+ for (int i = 0; i < pipeline.numFragmentProcessors(); ++i) {
+ append_sampled_images(pipeline.getFragmentProcessor(i), fGpu, &fSampledImages);
+ }
+ append_sampled_images(pipeline.getXferProcessor(), fGpu, &fSampledImages);
+
GrPrimitiveType primitiveType = meshes[0].primitiveType();
sk_sp<GrVkPipelineState> pipelineState = this->prepareDrawState(pipeline,
primProc,
@@ -380,12 +386,6 @@ void GrVkGpuCommandBuffer::onDraw(const GrPipeline& pipeline,
return;
}
- append_sampled_images(primProc, fGpu, &fSampledImages);
- for (int i = 0; i < pipeline.numFragmentProcessors(); ++i) {
- append_sampled_images(pipeline.getFragmentProcessor(i), fGpu, &fSampledImages);
- }
- append_sampled_images(pipeline.getXferProcessor(), fGpu, &fSampledImages);
-
for (int i = 0; i < meshCount; ++i) {
const GrMesh& mesh = meshes[i];
GrMesh::Iterator iter;
« src/gpu/vk/GrVkGpu.cpp ('K') | « src/gpu/vk/GrVkGpu.cpp ('k') | src/gpu/vk/GrVkSampler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698