Stage 1 of rename
TODO: re-enable glave build, advance API for glave
v2: get rid of outdated code in tri introduced by rebase
rename wsi_null.c (olv)
diff --git a/icd/intel/sampler.h b/icd/intel/sampler.h
index f01283e..4b77843 100644
--- a/icd/intel/sampler.h
+++ b/icd/intel/sampler.h
@@ -1,5 +1,5 @@
/*
- * XGL
+ * Vulkan
*
* Copyright (C) 2014 LunarG, Inc.
*
@@ -41,7 +41,7 @@
uint32_t cmd[15];
};
-static inline struct intel_sampler *intel_sampler(XGL_SAMPLER sampler)
+static inline struct intel_sampler *intel_sampler(VK_SAMPLER sampler)
{
return (struct intel_sampler *) sampler;
}
@@ -51,8 +51,8 @@
return (struct intel_sampler *) obj;
}
-XGL_RESULT intel_sampler_create(struct intel_dev *dev,
- const XGL_SAMPLER_CREATE_INFO *info,
+VK_RESULT intel_sampler_create(struct intel_dev *dev,
+ const VK_SAMPLER_CREATE_INFO *info,
struct intel_sampler **sampler_ret);
void intel_sampler_destroy(struct intel_sampler *sampler);