aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Stroyan <mike@LunarG.com>2015-09-11 13:29:21 -0600
committerMike Stroyan <mike@LunarG.com>2015-09-22 09:37:06 -0600
commit092e33791ce4931ef03c2d22346b96d48819b810 (patch)
tree46e3a9938f6c4b7c331d874d02cf97305d1ec833
parentc1d3cf7fb68cde48585f79fc3bd76babba694c51 (diff)
downloadusermoji-092e33791ce4931ef03c2d22346b96d48819b810.tar.xz
layers: make DrawState globals static
Prevent symbol name collisions, especially with other layers.
-rw-r--r--layers/draw_state.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 10b56d88..abc7c418 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -60,24 +60,24 @@ static std::unordered_map<void *, layer_data *> layer_data_map;
static device_table_map draw_state_device_table_map;
static instance_table_map draw_state_instance_table_map;
-unordered_map<uint64_t, SAMPLER_NODE*> sampleMap;
-unordered_map<uint64_t, VkImageViewCreateInfo> imageMap;
-unordered_map<uint64_t, VkImageViewCreateInfo> viewMap;
-unordered_map<uint64_t, BUFFER_NODE*> bufferMap;
-unordered_map<uint64_t, VkDynamicViewportStateCreateInfo> dynamicVpStateMap;
-unordered_map<uint64_t, VkDynamicLineWidthStateCreateInfo> dynamicLineWidthStateMap;
-unordered_map<uint64_t, VkDynamicDepthBiasStateCreateInfo> dynamicDepthBiasStateMap;
-unordered_map<uint64_t, VkDynamicBlendStateCreateInfo> dynamicBlendStateMap;
-unordered_map<uint64_t, VkDynamicDepthBoundsStateCreateInfo> dynamicDepthBoundsStateMap;
-unordered_map<uint64_t, std::pair<VkDynamicStencilStateCreateInfo, VkDynamicStencilStateCreateInfo>> dynamicStencilStateMap;
-unordered_map<uint64_t, PIPELINE_NODE*> pipelineMap;
-unordered_map<uint64_t, POOL_NODE*> poolMap;
-unordered_map<uint64_t, SET_NODE*> setMap;
-unordered_map<uint64_t, LAYOUT_NODE*> layoutMap;
+static unordered_map<uint64_t, SAMPLER_NODE*> sampleMap;
+static unordered_map<uint64_t, VkImageViewCreateInfo> imageMap;
+static unordered_map<uint64_t, VkImageViewCreateInfo> viewMap;
+static unordered_map<uint64_t, BUFFER_NODE*> bufferMap;
+static unordered_map<uint64_t, VkDynamicViewportStateCreateInfo> dynamicVpStateMap;
+static unordered_map<uint64_t, VkDynamicLineWidthStateCreateInfo> dynamicLineWidthStateMap;
+static unordered_map<uint64_t, VkDynamicDepthBiasStateCreateInfo> dynamicDepthBiasStateMap;
+static unordered_map<uint64_t, VkDynamicBlendStateCreateInfo> dynamicBlendStateMap;
+static unordered_map<uint64_t, VkDynamicDepthBoundsStateCreateInfo> dynamicDepthBoundsStateMap;
+static unordered_map<uint64_t, std::pair<VkDynamicStencilStateCreateInfo, VkDynamicStencilStateCreateInfo>> dynamicStencilStateMap;
+static unordered_map<uint64_t, PIPELINE_NODE*> pipelineMap;
+static unordered_map<uint64_t, POOL_NODE*> poolMap;
+static unordered_map<uint64_t, SET_NODE*> setMap;
+static unordered_map<uint64_t, LAYOUT_NODE*> layoutMap;
// Map for layout chains
-unordered_map<void*, GLOBAL_CB_NODE*> cmdBufferMap;
-unordered_map<uint64_t, VkRenderPassCreateInfo*> renderPassMap;
-unordered_map<uint64_t, VkFramebufferCreateInfo*> frameBufferMap;
+static unordered_map<void*, GLOBAL_CB_NODE*> cmdBufferMap;
+static unordered_map<uint64_t, VkRenderPassCreateInfo*> renderPassMap;
+static unordered_map<uint64_t, VkFramebufferCreateInfo*> frameBufferMap;
struct devExts {
bool debug_marker_enabled;