Fill out more information in GrVkCaps

src/gpu/vk/GrVkCaps.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrVkCaps.h"
 
 #include "GrVkUtil.h"
@@ skipping 32 matching lines @@
     * GrVkCaps fields
     **************************************************************************/
     fMaxSampledTextures = 16; // Spec requires a minimum of 16 sampled textures per stage
 
     this->init(contextOptions, vkInterface, physDev);
 }
 
 void GrVkCaps::init(const GrContextOptions& contextOptions, const GrVkInterface* vkInterface,
                     VkPhysicalDevice physDev) {
 
-    this->initGLSLCaps(vkInterface, physDev);
+    VkPhysicalDeviceProperties properties;
+    GR_VK_CALL(vkInterface, GetPhysicalDeviceProperties(physDev, &properties));
+
+    VkPhysicalDeviceFeatures features;
+    GR_VK_CALL(vkInterface, GetPhysicalDeviceFeatures(physDev, &features));
+
+    VkPhysicalDeviceMemoryProperties memoryProperties;
+    GR_VK_CALL(vkInterface, GetPhysicalDeviceMemoryProperties(physDev, &memoryProperties));
+
+    this->initGrCaps(properties, features, memoryProperties);
+    this->initGLSLCaps(features);
     this->initConfigTexturableTable(vkInterface, physDev);
     this->initConfigRenderableTable(vkInterface, physDev);
     this->initStencilFormats(vkInterface, physDev);
 
-    VkPhysicalDeviceProperties properties;
-    GR_VK_CALL(vkInterface, GetPhysicalDeviceProperties(physDev, &properties));
 
-    // We could actually querey and get a max size for each config, however maxImageDimension2D will
-    // give the minimum max size across all configs. So for simplicity we will use that for now.
-    fMaxRenderTargetSize = properties.limits.maxImageDimension2D;
-    fMaxTextureSize = properties.limits.maxImageDimension2D;
-
-    this->initSampleCount(properties);
-
-    fMaxSampledTextures = SkTMin(properties.limits.maxPerStageDescriptorSampledImages,
-                                 properties.limits.maxPerStageDescriptorSamplers);
 
     this->applyOptionsOverrides(contextOptions);
     // need to friend GrVkCaps in GrGLSLCaps.h
     // GrGLSLCaps* glslCaps = static_cast<GrGLSLCaps*>(fShaderCaps.get());
     // glslCaps->applyOptionsOverrides(contextOptions);
 }
 
 int get_max_sample_count(VkSampleCountFlags flags) {
     SkASSERT(flags & VK_SAMPLE_COUNT_1_BIT);
     if (!(flags & VK_SAMPLE_COUNT_2_BIT)) {
@@ skipping 18 matching lines @@
 }
 
 void GrVkCaps::initSampleCount(const VkPhysicalDeviceProperties& properties) {
     VkSampleCountFlags colorSamples = properties.limits.framebufferColorSampleCounts;
     VkSampleCountFlags stencilSamples = properties.limits.framebufferStencilSampleCounts;
 
     fMaxColorSampleCount = get_max_sample_count(colorSamples);
     fMaxStencilSampleCount = get_max_sample_count(stencilSamples);
 }
 
-void GrVkCaps::initGLSLCaps(const GrVkInterface* interface, VkPhysicalDevice physDev) {
+void GrVkCaps::initGrCaps(const VkPhysicalDeviceProperties& properties,
+                          const VkPhysicalDeviceFeatures& features,
+                          const VkPhysicalDeviceMemoryProperties& memoryProperites) {
+    // We could actually query and get a max size for each config, however maxImageDimension2D will
+    // give the minimum max size across all configs. So for simplicity we will use that for now.
+    fMaxRenderTargetSize = properties.limits.maxImageDimension2D;
+    fMaxTextureSize = properties.limits.maxImageDimension2D;
+
+    this->initSampleCount(properties);
+
+    fMaxSampledTextures = SkTMin(properties.limits.maxPerStageDescriptorSampledImages,
+                                 properties.limits.maxPerStageDescriptorSamplers);
+
+    // Assuming since we will always map in the end to upload the data we might as well just map
+    // from the get go. There is no hard data to suggest this is faster or slower.
+    fGeometryBufferMapThreshold = 0;
+
+    fMapBufferFlags = kCanMap_MapFlag | kSubset_MapFlag;
+
+    fStencilWrapOpsSupport = true;
+    fOversizedStencilSupport = true;
+}
+
+void GrVkCaps::initGLSLCaps(const VkPhysicalDeviceFeatures& features) {
     GrGLSLCaps* glslCaps = static_cast<GrGLSLCaps*>(fShaderCaps.get());
-    // TODO: actually figure out a correct version here
-    glslCaps->fVersionDeclString = "#version 140\n";
+    glslCaps->fVersionDeclString = "#version 310 es\n";
 
     // fConfigOutputSwizzle will default to RGBA so we only need to set it for alpha only config.
     for (int i = 0; i < kGrPixelConfigCnt; ++i) {
         GrPixelConfig config = static_cast<GrPixelConfig>(i);
         if (GrPixelConfigIsAlphaOnly(config)) {
             glslCaps->fConfigTextureSwizzle[i] = GrSwizzle::RRRR();
             glslCaps->fConfigOutputSwizzle[i] = GrSwizzle::AAAA();
         } else {
             glslCaps->fConfigTextureSwizzle[i] = GrSwizzle::RGBA();
         }
     }
 
+    // Vulkan is based off ES 3.0 so the following should all be supported
+    glslCaps->fUsesPrecisionModifiers = true;
+    glslCaps->fFlatInterpolationSupport = true;
+
+    // GrShaderCaps
+
     glslCaps->fShaderDerivativeSupport = true;
+    glslCaps->fGeometryShaderSupport = features.geometryShader == VK_TRUE;
+#if 0
+    // For now disabling dual source blending till we get it hooked up in the rest of system
+    glslCaps->fDualSourceBlendingSupport = features.dualSrcBlend;
+#endif
+    glslCaps->fIntegerSupport = true;
 }
 
 static void format_supported_for_feature(const GrVkInterface* interface,
                                          VkPhysicalDevice physDev,
                                          VkFormat format,
                                          VkFormatFeatureFlagBits featureBit,
                                          bool* linearSupport,
                                          bool* optimalSupport) {
     VkFormatProperties props;
     memset(&props, 0, sizeof(VkFormatProperties));
@@ skipping 102 matching lines @@
                   // internal Format             stencil bits      total bits        packed?
         gS8    = { VK_FORMAT_S8_UINT,            8,                 8,               false },
         gD24S8 = { VK_FORMAT_D24_UNORM_S8_UINT,  8,                32,               true };
 
     // I'm simply assuming that these two will be supported since they are used in example code.
     // TODO: Actaully figure this out
     SET_CONFIG_CAN_STENCIL(gS8);
     SET_CONFIG_CAN_STENCIL(gD24S8);
 }