Integers can now be passed as uniforms

src/gpu/vk/GrVkPipelineStateDataManager.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "GrVkPipelineStateDataManager.h"
 
 #include "GrVkGpu.h"
@@ skipping 36 matching lines @@
     }
     else {
         SkASSERT(GrVkUniformHandler::kFragBinding == uni.fBinding);
         buffer = fFragmentUniformData.get();
         fFragmentUniformsDirty = true;
     }
     buffer = static_cast<char*>(buffer)+uni.fOffset;
     return buffer;
 }
 
+void GrVkPipelineStateDataManager::set1i(UniformHandle u, int32_t i) const {
+    // TODO (fmenozzi): Until we know for sure
+    SkASSERT(false);

[tomhudson, 2016/06/20 15:22:17]

Not happy.

[egdaniel, 2016/06/20 16:21:49]

oh sorry wire's got crossed. Since I've mentioned this, we know vulkan takes 32
bit ints. So we don't need the assert here. It was a way to unblock this CL
before he got to the point of actually landing a change that used this function.

+
+    const Uniform& uni = fUniforms[u.toIndex()];
+    SkASSERT(uni.fType == kInt_GrSLType);
+    SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
+    void* buffer = this->getBufferPtrAndMarkDirty(uni);
+    SkASSERT(sizeof(int32_t) == 4);
+    memcpy(buffer, &i, sizeof(int32_t));
+}
+
 void GrVkPipelineStateDataManager::set1f(UniformHandle u, float v0) const {
     const Uniform& uni = fUniforms[u.toIndex()];
     SkASSERT(uni.fType == kFloat_GrSLType);
     SkASSERT(GrGLSLShaderVar::kNonArray == uni.fArrayCount);
     void* buffer = this->getBufferPtrAndMarkDirty(uni);
     SkASSERT(sizeof(float) == 4);
     memcpy(buffer, &v0, sizeof(float));
 }
 
 void GrVkPipelineStateDataManager::set1fv(UniformHandle u,
@@ skipping 186 matching lines @@
         fVertexUniformsDirty = false;
     }
 
     if (fragmentBuffer && fFragmentUniformsDirty) {
         SkAssertResult(fragmentBuffer->updateData(gpu, fFragmentUniformData.get(),
                                                   fFragmentUniformSize, &updatedBuffer));
         fFragmentUniformsDirty = false;
     }
     return updatedBuffer;
 }