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/desc.h b/icd/intel/desc.h
index a7762c7..11cf6c5 100644
--- a/icd/intel/desc.h
+++ b/icd/intel/desc.h
@@ -1,5 +1,5 @@
/*
- * XGL
+ * Vulkan
*
* Copyright (C) 2015 LunarG, Inc.
*
@@ -49,7 +49,7 @@
};
struct intel_desc_iter {
- XGL_DESCRIPTOR_TYPE type;
+ VK_DESCRIPTOR_TYPE type;
struct intel_desc_offset increment;
uint32_t size;
@@ -106,7 +106,7 @@
/* homogeneous bindings in this layout */
struct intel_desc_layout_binding {
- XGL_DESCRIPTOR_TYPE type;
+ VK_DESCRIPTOR_TYPE type;
uint32_t array_size;
const struct intel_sampler **immutable_samplers;
const struct intel_sampler *shared_immutable_sampler;
@@ -134,7 +134,7 @@
uint32_t total_dynamic_desc_count;
};
-static inline struct intel_desc_pool *intel_desc_pool(XGL_DESCRIPTOR_POOL pool)
+static inline struct intel_desc_pool *intel_desc_pool(VK_DESCRIPTOR_POOL pool)
{
return (struct intel_desc_pool *) pool;
}
@@ -144,7 +144,7 @@
return (struct intel_desc_pool *) obj;
}
-static inline struct intel_desc_set *intel_desc_set(XGL_DESCRIPTOR_SET set)
+static inline struct intel_desc_set *intel_desc_set(VK_DESCRIPTOR_SET set)
{
return (struct intel_desc_set *) set;
}
@@ -154,7 +154,7 @@
return (struct intel_desc_set *) obj;
}
-static inline struct intel_desc_layout *intel_desc_layout(XGL_DESCRIPTOR_SET_LAYOUT layout)
+static inline struct intel_desc_layout *intel_desc_layout(VK_DESCRIPTOR_SET_LAYOUT layout)
{
return (struct intel_desc_layout *) layout;
}
@@ -164,7 +164,7 @@
return (struct intel_desc_layout *) obj;
}
-static inline struct intel_desc_layout_chain *intel_desc_layout_chain(XGL_DESCRIPTOR_SET_LAYOUT_CHAIN chain)
+static inline struct intel_desc_layout_chain *intel_desc_layout_chain(VK_DESCRIPTOR_SET_LAYOUT_CHAIN chain)
{
return (struct intel_desc_layout_chain *) chain;
}
@@ -220,22 +220,22 @@
bool intel_desc_iter_advance(struct intel_desc_iter *iter);
-XGL_RESULT intel_desc_region_create(struct intel_dev *dev,
+VK_RESULT intel_desc_region_create(struct intel_dev *dev,
struct intel_desc_region **region_ret);
void intel_desc_region_destroy(struct intel_dev *dev,
struct intel_desc_region *region);
-XGL_RESULT intel_desc_region_alloc(struct intel_desc_region *region,
- const XGL_DESCRIPTOR_POOL_CREATE_INFO *info,
+VK_RESULT intel_desc_region_alloc(struct intel_desc_region *region,
+ const VK_DESCRIPTOR_POOL_CREATE_INFO *info,
struct intel_desc_offset *begin,
struct intel_desc_offset *end);
void intel_desc_region_free(struct intel_desc_region *region,
const struct intel_desc_offset *begin,
const struct intel_desc_offset *end);
-XGL_RESULT intel_desc_region_begin_update(struct intel_desc_region *region,
- XGL_DESCRIPTOR_UPDATE_MODE mode);
-XGL_RESULT intel_desc_region_end_update(struct intel_desc_region *region,
+VK_RESULT intel_desc_region_begin_update(struct intel_desc_region *region,
+ VK_DESCRIPTOR_UPDATE_MODE mode);
+VK_RESULT intel_desc_region_end_update(struct intel_desc_region *region,
struct intel_cmd *cmd);
void intel_desc_region_clear(struct intel_desc_region *region,
@@ -255,7 +255,7 @@
void intel_desc_region_read_surface(const struct intel_desc_region *region,
const struct intel_desc_offset *offset,
- XGL_PIPELINE_SHADER_STAGE stage,
+ VK_PIPELINE_SHADER_STAGE stage,
const struct intel_mem **mem,
bool *read_only,
const uint32_t **cmd,
@@ -264,44 +264,44 @@
const struct intel_desc_offset *offset,
const struct intel_sampler **sampler);
-XGL_RESULT intel_desc_pool_create(struct intel_dev *dev,
- XGL_DESCRIPTOR_POOL_USAGE usage,
+VK_RESULT intel_desc_pool_create(struct intel_dev *dev,
+ VK_DESCRIPTOR_POOL_USAGE usage,
uint32_t max_sets,
- const XGL_DESCRIPTOR_POOL_CREATE_INFO *info,
+ const VK_DESCRIPTOR_POOL_CREATE_INFO *info,
struct intel_desc_pool **pool_ret);
void intel_desc_pool_destroy(struct intel_desc_pool *pool);
-XGL_RESULT intel_desc_pool_alloc(struct intel_desc_pool *pool,
+VK_RESULT intel_desc_pool_alloc(struct intel_desc_pool *pool,
const struct intel_desc_layout *layout,
struct intel_desc_offset *begin,
struct intel_desc_offset *end);
void intel_desc_pool_reset(struct intel_desc_pool *pool);
-XGL_RESULT intel_desc_set_create(struct intel_dev *dev,
+VK_RESULT intel_desc_set_create(struct intel_dev *dev,
struct intel_desc_pool *pool,
- XGL_DESCRIPTOR_SET_USAGE usage,
+ VK_DESCRIPTOR_SET_USAGE usage,
const struct intel_desc_layout *layout,
struct intel_desc_set **set_ret);
void intel_desc_set_destroy(struct intel_desc_set *set);
void intel_desc_set_update_samplers(struct intel_desc_set *set,
- const XGL_UPDATE_SAMPLERS *update);
+ const VK_UPDATE_SAMPLERS *update);
void intel_desc_set_update_sampler_textures(struct intel_desc_set *set,
- const XGL_UPDATE_SAMPLER_TEXTURES *update);
+ const VK_UPDATE_SAMPLER_TEXTURES *update);
void intel_desc_set_update_images(struct intel_desc_set *set,
- const XGL_UPDATE_IMAGES *update);
+ const VK_UPDATE_IMAGES *update);
void intel_desc_set_update_buffers(struct intel_desc_set *set,
- const XGL_UPDATE_BUFFERS *update);
+ const VK_UPDATE_BUFFERS *update);
void intel_desc_set_update_as_copy(struct intel_desc_set *set,
- const XGL_UPDATE_AS_COPY *update);
+ const VK_UPDATE_AS_COPY *update);
-XGL_RESULT intel_desc_layout_create(struct intel_dev *dev,
- const XGL_DESCRIPTOR_SET_LAYOUT_CREATE_INFO *info,
+VK_RESULT intel_desc_layout_create(struct intel_dev *dev,
+ const VK_DESCRIPTOR_SET_LAYOUT_CREATE_INFO *info,
struct intel_desc_layout **layout_ret);
void intel_desc_layout_destroy(struct intel_desc_layout *layout);
-XGL_RESULT intel_desc_layout_chain_create(struct intel_dev *dev,
- const XGL_DESCRIPTOR_SET_LAYOUT *layouts,
+VK_RESULT intel_desc_layout_chain_create(struct intel_dev *dev,
+ const VK_DESCRIPTOR_SET_LAYOUT *layouts,
uint32_t count,
struct intel_desc_layout_chain **chain_ret);
void intel_desc_layout_chain_destroy(struct intel_desc_layout_chain *chain);