v156: Bug 14451 - Rename dynamic state objects
diff --git a/icd/intel/cmd.h b/icd/intel/cmd.h
index 9d83eb7..c6dfec6 100644
--- a/icd/intel/cmd.h
+++ b/icd/intel/cmd.h
@@ -164,10 +164,10 @@
struct {
const struct intel_dynamic_viewport *viewport;
- const struct intel_dynamic_raster_line *raster_line;
- const struct intel_dynamic_raster_depth_bias *raster_depth_bias;
- const struct intel_dynamic_color_blend *blend;
- const struct intel_dynamic_depth *depth;
+ const struct intel_dynamic_line_width *line_width;
+ const struct intel_dynamic_depth_bias *depth_bias;
+ const struct intel_dynamic_blend *blend;
+ const struct intel_dynamic_depth_bounds *depth_bounds;
const struct intel_dynamic_stencil *stencil;
} state;
diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index e48de3b..61d7843 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -479,8 +479,8 @@
const struct intel_render_pass *rp = cmd->bind.render_pass;
const struct intel_render_pass_subpass *subpass =
cmd->bind.render_pass_subpass;
- const struct intel_dynamic_raster_line *raster_line = cmd->bind.state.raster_line;
- const struct intel_dynamic_raster_depth_bias *raster_depth_bias = cmd->bind.state.raster_depth_bias;
+ const struct intel_dynamic_line_width *line_width = cmd->bind.state.line_width;
+ const struct intel_dynamic_depth_bias *depth_bias = cmd->bind.state.depth_bias;
uint32_t dw1, dw2, dw3, dw4, dw5, dw6;
CMD_ASSERT(cmd, 6, 7.5);
@@ -519,7 +519,7 @@
dw2 |= GEN7_SF_DW2_SCISSOR_ENABLE;
// TODO: line width support
- (void) raster_line;
+ (void) line_width;
if (pipeline->sample_count > 1) {
dw2 |= 128 << GEN7_SF_DW2_LINE_WIDTH__SHIFT |
@@ -535,9 +535,9 @@
GEN7_SF_DW3_SUBPIXEL_8BITS;
if (pipeline->depthBiasEnable) {
- dw4 = u_fui((float) raster_depth_bias->raster_depth_bias_info.depthBias * 2.0f);
- dw5 = u_fui(raster_depth_bias->raster_depth_bias_info.slopeScaledDepthBias);
- dw6 = u_fui(raster_depth_bias->raster_depth_bias_info.depthBiasClamp);
+ dw4 = u_fui((float) depth_bias->depth_bias_info.depthBias * 2.0f);
+ dw5 = u_fui(depth_bias->depth_bias_info.slopeScaledDepthBias);
+ dw6 = u_fui(depth_bias->depth_bias_info.depthBiasClamp);
} else {
dw4 = 0;
dw5 = 0;
@@ -1120,9 +1120,9 @@
/* TODO: enable back facing stencil state */
/* same read and write masks for both front and back faces */
- dw[1] = (stencil_state->stencil_info_front.stencilReadMask & 0xff) << 24 |
+ dw[1] = (stencil_state->stencil_info_front.stencilCompareMask & 0xff) << 24 |
(stencil_state->stencil_info_front.stencilWriteMask & 0xff) << 16 |
- (stencil_state->stencil_info_front.stencilReadMask & 0xff) << 8 |
+ (stencil_state->stencil_info_front.stencilCompareMask & 0xff) << 8 |
(stencil_state->stencil_info_front.stencilWriteMask & 0xff);
dw[2] = pipeline->cmd_depth_test;
@@ -1476,8 +1476,7 @@
static void gen6_cc_states(struct intel_cmd *cmd)
{
- const struct intel_dynamic_color_blend *blend = cmd->bind.state.blend;
- const struct intel_dynamic_depth *ds = cmd->bind.state.depth;
+ const struct intel_dynamic_blend *blend = cmd->bind.state.blend;
const struct intel_dynamic_stencil *ss = cmd->bind.state.stencil;
uint32_t blend_offset, ds_offset, cc_offset;
uint32_t stencil_ref;
@@ -1488,7 +1487,7 @@
blend_offset = gen6_BLEND_STATE(cmd);
if (blend)
- memcpy(blend_color, blend->color_blend_info.blendConst, sizeof(blend_color));
+ memcpy(blend_color, blend->blend_info.blendConst, sizeof(blend_color));
else
memset(blend_color, 0, sizeof(blend_color));
@@ -1543,8 +1542,8 @@
static void gen7_cc_states(struct intel_cmd *cmd)
{
- const struct intel_dynamic_color_blend *blend = cmd->bind.state.blend;
- const struct intel_dynamic_depth *ds = cmd->bind.state.depth;
+ const struct intel_dynamic_blend *blend = cmd->bind.state.blend;
+ const struct intel_dynamic_depth_bounds *ds = cmd->bind.state.depth_bounds;
const struct intel_dynamic_stencil *ss = cmd->bind.state.stencil;
uint32_t stencil_ref;
uint32_t blend_color[4];
@@ -1560,7 +1559,7 @@
GEN7_RENDER_OPCODE_3DSTATE_BLEND_STATE_POINTERS, offset);
if (blend)
- memcpy(blend_color, blend->color_blend_info.blendConst, sizeof(blend_color));
+ memcpy(blend_color, blend->blend_info.blendConst, sizeof(blend_color));
else
memset(blend_color, 0, sizeof(blend_color));
@@ -3226,22 +3225,22 @@
cmd->bind.state.viewport = state;
}
-static void cmd_bind_raster_line_state(struct intel_cmd *cmd,
- const struct intel_dynamic_raster_line *state)
+static void cmd_bind_line_width_state(struct intel_cmd *cmd,
+ const struct intel_dynamic_line_width *state)
{
- cmd->bind.state.raster_line = state;
+ cmd->bind.state.line_width = state;
}
-static void cmd_bind_raster_depth_bias_state(struct intel_cmd *cmd,
- const struct intel_dynamic_raster_depth_bias *state)
+static void cmd_bind_depth_bias_state(struct intel_cmd *cmd,
+ const struct intel_dynamic_depth_bias *state)
{
- cmd->bind.state.raster_depth_bias = state;
+ cmd->bind.state.depth_bias = state;
}
-static void cmd_bind_depth_state(struct intel_cmd *cmd,
- const struct intel_dynamic_depth*state)
+static void cmd_bind_depth_bounds_state(struct intel_cmd *cmd,
+ const struct intel_dynamic_depth_bounds *state)
{
- cmd->bind.state.depth = state;
+ cmd->bind.state.depth_bounds = state;
}
static void cmd_bind_stencil_state(struct intel_cmd *cmd,
@@ -3251,7 +3250,7 @@
}
static void cmd_bind_blend_state(struct intel_cmd *cmd,
- const struct intel_dynamic_color_blend *state)
+ const struct intel_dynamic_blend *state)
{
cmd->bind.state.blend = state;
}
@@ -3486,44 +3485,44 @@
intel_dynamic_viewport(state));
}
-ICD_EXPORT void VKAPI vkCmdBindDynamicRasterLineState(
+ICD_EXPORT void VKAPI vkCmdBindDynamicLineWidthState(
VkCmdBuffer cmdBuffer,
- VkDynamicRasterLineState state)
+ VkDynamicLineWidthState state)
{
struct intel_cmd *cmd = intel_cmd(cmdBuffer);
- cmd_bind_raster_line_state(cmd,
- intel_dynamic_raster_line(state));
+ cmd_bind_line_width_state(cmd,
+ intel_dynamic_line_width(state));
}
-ICD_EXPORT void VKAPI vkCmdBindDynamicRasterDepthBiasState(
+ICD_EXPORT void VKAPI vkCmdBindDynamicDepthBiasState(
VkCmdBuffer cmdBuffer,
- VkDynamicRasterDepthBiasState state)
+ VkDynamicDepthBiasState state)
{
struct intel_cmd *cmd = intel_cmd(cmdBuffer);
- cmd_bind_raster_depth_bias_state(cmd,
- intel_dynamic_raster_depth_bias(state));
+ cmd_bind_depth_bias_state(cmd,
+ intel_dynamic_depth_bias(state));
}
-ICD_EXPORT void VKAPI vkCmdBindDynamicColorBlendState(
+ICD_EXPORT void VKAPI vkCmdBindDynamicBlendState(
VkCmdBuffer cmdBuffer,
- VkDynamicColorBlendState state)
+ VkDynamicBlendState state)
{
struct intel_cmd *cmd = intel_cmd(cmdBuffer);
cmd_bind_blend_state(cmd,
- intel_dynamic_color_blend(state));
+ intel_dynamic_blend(state));
}
-ICD_EXPORT void VKAPI vkCmdBindDynamicDepthState(
+ICD_EXPORT void VKAPI vkCmdBindDynamicDepthBoundsState(
VkCmdBuffer cmdBuffer,
- VkDynamicDepthState state)
+ VkDynamicDepthBoundsState state)
{
struct intel_cmd *cmd = intel_cmd(cmdBuffer);
- cmd_bind_depth_state(cmd,
- intel_dynamic_depth(state));
+ cmd_bind_depth_bounds_state(cmd,
+ intel_dynamic_depth_bounds(state));
}
ICD_EXPORT void VKAPI vkCmdBindDynamicStencilState(
diff --git a/icd/intel/obj.c b/icd/intel/obj.c
index eabb842..2e0596c 100644
--- a/icd/intel/obj.c
+++ b/icd/intel/obj.c
@@ -105,21 +105,21 @@
assert(info.header->struct_type == VK_STRUCTURE_TYPE_DYNAMIC_VIEWPORT_STATE_CREATE_INFO);
shallow_copy = sizeof(VkDynamicViewportStateCreateInfo);
break;
- case VK_OBJECT_TYPE_DYNAMIC_RASTER_LINE_STATE:
- assert(info.header->struct_type == VK_STRUCTURE_TYPE_DYNAMIC_RASTER_LINE_STATE_CREATE_INFO);
- shallow_copy = sizeof(VkDynamicRasterLineStateCreateInfo);
+ case VK_OBJECT_TYPE_DYNAMIC_LINE_WIDTH_STATE:
+ assert(info.header->struct_type == VK_STRUCTURE_TYPE_DYNAMIC_LINE_WIDTH_STATE_CREATE_INFO);
+ shallow_copy = sizeof(VkDynamicLineWidthStateCreateInfo);
break;
- case VK_OBJECT_TYPE_DYNAMIC_RASTER_DEPTH_BIAS_STATE:
- assert(info.header->struct_type == VK_STRUCTURE_TYPE_DYNAMIC_RASTER_DEPTH_BIAS_STATE_CREATE_INFO);
- shallow_copy = sizeof(VkDynamicRasterDepthBiasStateCreateInfo);
+ case VK_OBJECT_TYPE_DYNAMIC_DEPTH_BIAS_STATE:
+ assert(info.header->struct_type == VK_STRUCTURE_TYPE_DYNAMIC_DEPTH_BIAS_STATE_CREATE_INFO);
+ shallow_copy = sizeof(VkDynamicDepthBiasStateCreateInfo);
break;
- case VK_OBJECT_TYPE_DYNAMIC_COLOR_BLEND_STATE:
- assert(info.header->struct_type == VK_STRUCTURE_TYPE_DYNAMIC_COLOR_BLEND_STATE_CREATE_INFO);
- shallow_copy = sizeof(VkDynamicColorBlendStateCreateInfo);
+ case VK_OBJECT_TYPE_DYNAMIC_BLEND_STATE:
+ assert(info.header->struct_type == VK_STRUCTURE_TYPE_DYNAMIC_BLEND_STATE_CREATE_INFO);
+ shallow_copy = sizeof(VkDynamicBlendStateCreateInfo);
break;
- case VK_OBJECT_TYPE_DYNAMIC_DEPTH_STATE:
- assert(info.header->struct_type == VK_STRUCTURE_TYPE_DYNAMIC_DEPTH_STATE_CREATE_INFO);
- shallow_copy = sizeof(VkDynamicDepthStateCreateInfo);
+ case VK_OBJECT_TYPE_DYNAMIC_DEPTH_BOUNDS_STATE:
+ assert(info.header->struct_type == VK_STRUCTURE_TYPE_DYNAMIC_DEPTH_BOUNDS_STATE_CREATE_INFO);
+ shallow_copy = sizeof(VkDynamicDepthBoundsStateCreateInfo);
break;
case VK_OBJECT_TYPE_DYNAMIC_STENCIL_STATE:
assert(info.header->struct_type == VK_STRUCTURE_TYPE_DYNAMIC_STENCIL_STATE_CREATE_INFO);
diff --git a/icd/intel/state.c b/icd/intel/state.c
index f641e5b..cfa18c9 100644
--- a/icd/intel/state.c
+++ b/icd/intel/state.c
@@ -253,122 +253,122 @@
intel_base_destroy(&state->obj.base);
}
-static void raster_line_state_destroy(struct intel_obj *obj)
+static void line_width_state_destroy(struct intel_obj *obj)
{
- struct intel_dynamic_raster_line *state = intel_raster_line_state_from_obj(obj);
+ struct intel_dynamic_line_width *state = intel_line_width_state_from_obj(obj);
- intel_raster_line_state_destroy(state);
+ intel_line_width_state_destroy(state);
}
-VkResult intel_raster_line_state_create(struct intel_dev *dev,
- const VkDynamicRasterLineStateCreateInfo *info,
- struct intel_dynamic_raster_line **state_ret)
+VkResult intel_line_width_state_create(struct intel_dev *dev,
+ const VkDynamicLineWidthStateCreateInfo *info,
+ struct intel_dynamic_line_width **state_ret)
{
- struct intel_dynamic_raster_line *state;
+ struct intel_dynamic_line_width *state;
- state = (struct intel_dynamic_raster_line *) intel_base_create(&dev->base.handle,
- sizeof(*state), dev->base.dbg, VK_OBJECT_TYPE_DYNAMIC_RASTER_LINE_STATE,
+ state = (struct intel_dynamic_line_width *) intel_base_create(&dev->base.handle,
+ sizeof(*state), dev->base.dbg, VK_OBJECT_TYPE_DYNAMIC_LINE_WIDTH_STATE,
info, 0);
if (!state)
return VK_ERROR_OUT_OF_HOST_MEMORY;
- state->obj.destroy = raster_line_state_destroy;
- state->raster_line_info = *info;
+ state->obj.destroy = line_width_state_destroy;
+ state->line_width_info = *info;
*state_ret = state;
return VK_SUCCESS;
}
-void intel_raster_line_state_destroy(struct intel_dynamic_raster_line *state)
+void intel_line_width_state_destroy(struct intel_dynamic_line_width *state)
{
intel_base_destroy(&state->obj.base);
}
-static void raster_depth_bias_state_destroy(struct intel_obj *obj)
+static void depth_bias_state_destroy(struct intel_obj *obj)
{
- struct intel_dynamic_raster_depth_bias *state = intel_raster_depth_bias_state_from_obj(obj);
+ struct intel_dynamic_depth_bias *state = intel_depth_bias_state_from_obj(obj);
- intel_raster_depth_bias_state_destroy(state);
+ intel_depth_bias_state_destroy(state);
}
-VkResult intel_raster_depth_bias_state_create(struct intel_dev *dev,
- const VkDynamicRasterDepthBiasStateCreateInfo *info,
- struct intel_dynamic_raster_depth_bias **state_ret)
+VkResult intel_depth_bias_state_create(struct intel_dev *dev,
+ const VkDynamicDepthBiasStateCreateInfo *info,
+ struct intel_dynamic_depth_bias **state_ret)
{
- struct intel_dynamic_raster_depth_bias *state;
+ struct intel_dynamic_depth_bias *state;
- state = (struct intel_dynamic_raster_depth_bias *) intel_base_create(&dev->base.handle,
- sizeof(*state), dev->base.dbg, VK_OBJECT_TYPE_DYNAMIC_RASTER_DEPTH_BIAS_STATE,
+ state = (struct intel_dynamic_depth_bias *) intel_base_create(&dev->base.handle,
+ sizeof(*state), dev->base.dbg, VK_OBJECT_TYPE_DYNAMIC_DEPTH_BIAS_STATE,
info, 0);
if (!state)
return VK_ERROR_OUT_OF_HOST_MEMORY;
- state->obj.destroy = raster_depth_bias_state_destroy;
- state->raster_depth_bias_info = *info;
+ state->obj.destroy = depth_bias_state_destroy;
+ state->depth_bias_info = *info;
*state_ret = state;
return VK_SUCCESS;
}
-void intel_raster_depth_bias_state_destroy(struct intel_dynamic_raster_depth_bias *state)
+void intel_depth_bias_state_destroy(struct intel_dynamic_depth_bias *state)
{
intel_base_destroy(&state->obj.base);
}
static void blend_state_destroy(struct intel_obj *obj)
{
- struct intel_dynamic_color_blend *state = intel_blend_state_from_obj(obj);
+ struct intel_dynamic_blend *state = intel_blend_state_from_obj(obj);
intel_blend_state_destroy(state);
}
VkResult intel_blend_state_create(struct intel_dev *dev,
- const VkDynamicColorBlendStateCreateInfo *info,
- struct intel_dynamic_color_blend **state_ret)
+ const VkDynamicBlendStateCreateInfo *info,
+ struct intel_dynamic_blend **state_ret)
{
- struct intel_dynamic_color_blend *state;
+ struct intel_dynamic_blend *state;
- state = (struct intel_dynamic_color_blend *) intel_base_create(&dev->base.handle,
- sizeof(*state), dev->base.dbg, VK_OBJECT_TYPE_DYNAMIC_COLOR_BLEND_STATE,
+ state = (struct intel_dynamic_blend *) intel_base_create(&dev->base.handle,
+ sizeof(*state), dev->base.dbg, VK_OBJECT_TYPE_DYNAMIC_BLEND_STATE,
info, 0);
if (!state)
return VK_ERROR_OUT_OF_HOST_MEMORY;
state->obj.destroy = blend_state_destroy;
- state->color_blend_info = *info;
+ state->blend_info = *info;
*state_ret = state;
return VK_SUCCESS;
}
-void intel_blend_state_destroy(struct intel_dynamic_color_blend *state)
+void intel_blend_state_destroy(struct intel_dynamic_blend *state)
{
intel_base_destroy(&state->obj.base);
}
-static void depth_state_destroy(struct intel_obj *obj)
+static void depth_bounds_state_destroy(struct intel_obj *obj)
{
- struct intel_dynamic_depth *state = intel_depth_state_from_obj(obj);
+ struct intel_dynamic_depth_bounds *state = intel_depth_bounds_state_from_obj(obj);
- intel_depth_state_destroy(state);
+ intel_depth_bounds_state_destroy(state);
}
-VkResult intel_depth_state_create(struct intel_dev *dev,
- const VkDynamicDepthStateCreateInfo *info,
- struct intel_dynamic_depth **state_ret)
+VkResult intel_depth_bounds_state_create(struct intel_dev *dev,
+ const VkDynamicDepthBoundsStateCreateInfo *info,
+ struct intel_dynamic_depth_bounds **state_ret)
{
- struct intel_dynamic_depth *state;
+ struct intel_dynamic_depth_bounds *state;
- state = (struct intel_dynamic_depth *) intel_base_create(&dev->base.handle,
- sizeof(*state), dev->base.dbg, VK_OBJECT_TYPE_DYNAMIC_DEPTH_STATE,
+ state = (struct intel_dynamic_depth_bounds *) intel_base_create(&dev->base.handle,
+ sizeof(*state), dev->base.dbg, VK_OBJECT_TYPE_DYNAMIC_DEPTH_BOUNDS_STATE,
info, 0);
if (!state)
return VK_ERROR_OUT_OF_HOST_MEMORY;
- state->obj.destroy = depth_state_destroy;
+ state->obj.destroy = depth_bounds_state_destroy;
/*
* From the Sandy Bridge PRM, volume 2 part 1, page 359:
@@ -385,14 +385,14 @@
* TODO We do not check these yet.
*/
- state->depth_info = *info;
+ state->depth_bounds_info = *info;
*state_ret = state;
return VK_SUCCESS;
}
-void intel_depth_state_destroy(struct intel_dynamic_depth *state)
+void intel_depth_bounds_state_destroy(struct intel_dynamic_depth_bounds *state)
{
intel_base_destroy(&state->obj.base);
}
@@ -475,89 +475,89 @@
return VK_SUCCESS;
}
-ICD_EXPORT VkResult VKAPI vkCreateDynamicRasterLineState(
+ICD_EXPORT VkResult VKAPI vkCreateDynamicLineWidthState(
VkDevice device,
- const VkDynamicRasterLineStateCreateInfo* pCreateInfo,
- VkDynamicRasterLineState* pState)
+ const VkDynamicLineWidthStateCreateInfo* pCreateInfo,
+ VkDynamicLineWidthState* pState)
{
struct intel_dev *dev = intel_dev(device);
- return intel_raster_line_state_create(dev, pCreateInfo,
- (struct intel_dynamic_raster_line **) pState);
+ return intel_line_width_state_create(dev, pCreateInfo,
+ (struct intel_dynamic_line_width **) pState);
}
-ICD_EXPORT VkResult VKAPI vkDestroyDynamicRasterLineState(
+ICD_EXPORT VkResult VKAPI vkDestroyDynamicLineWidthState(
VkDevice device,
- VkDynamicRasterLineState dynamicRasterLineState)
+ VkDynamicLineWidthState dynamicLineWidthState)
{
- struct intel_obj *obj = intel_obj(dynamicRasterLineState.handle);
+ struct intel_obj *obj = intel_obj(dynamicLineWidthState.handle);
obj->destroy(obj);
return VK_SUCCESS;
}
-ICD_EXPORT VkResult VKAPI vkCreateDynamicRasterDepthBiasState(
+ICD_EXPORT VkResult VKAPI vkCreateDynamicDepthBiasState(
VkDevice device,
- const VkDynamicRasterDepthBiasStateCreateInfo* pCreateInfo,
- VkDynamicRasterDepthBiasState* pState)
+ const VkDynamicDepthBiasStateCreateInfo* pCreateInfo,
+ VkDynamicDepthBiasState* pState)
{
struct intel_dev *dev = intel_dev(device);
- return intel_raster_depth_bias_state_create(dev, pCreateInfo,
- (struct intel_dynamic_raster_depth_bias **) pState);
+ return intel_depth_bias_state_create(dev, pCreateInfo,
+ (struct intel_dynamic_depth_bias **) pState);
}
-ICD_EXPORT VkResult VKAPI vkDestroyDynamicRasterDepthBiasState(
+ICD_EXPORT VkResult VKAPI vkDestroyDynamicDepthBiasState(
VkDevice device,
- VkDynamicRasterDepthBiasState dynamicRasterDepthBiasState)
+ VkDynamicDepthBiasState dynamicDepthBiasState)
{
- struct intel_obj *obj = intel_obj(dynamicRasterDepthBiasState.handle);
+ struct intel_obj *obj = intel_obj(dynamicDepthBiasState.handle);
obj->destroy(obj);
return VK_SUCCESS;
}
-ICD_EXPORT VkResult VKAPI vkCreateDynamicColorBlendState(
+ICD_EXPORT VkResult VKAPI vkCreateDynamicBlendState(
VkDevice device,
- const VkDynamicColorBlendStateCreateInfo* pCreateInfo,
- VkDynamicColorBlendState* pState)
+ const VkDynamicBlendStateCreateInfo* pCreateInfo,
+ VkDynamicBlendState* pState)
{
struct intel_dev *dev = intel_dev(device);
return intel_blend_state_create(dev, pCreateInfo,
- (struct intel_dynamic_color_blend **) pState);
+ (struct intel_dynamic_blend **) pState);
}
-ICD_EXPORT VkResult VKAPI vkDestroyDynamicColorBlendState(
+ICD_EXPORT VkResult VKAPI vkDestroyDynamicBlendState(
VkDevice device,
- VkDynamicColorBlendState dynamicColorBlendState)
+ VkDynamicBlendState dynamicBlendState)
{
- struct intel_obj *obj = intel_obj(dynamicColorBlendState.handle);
+ struct intel_obj *obj = intel_obj(dynamicBlendState.handle);
obj->destroy(obj);
return VK_SUCCESS;
}
-ICD_EXPORT VkResult VKAPI vkCreateDynamicDepthState(
+ICD_EXPORT VkResult VKAPI vkCreateDynamicDepthBoundsState(
VkDevice device,
- const VkDynamicDepthStateCreateInfo* pCreateInfo,
- VkDynamicDepthState* pState)
+ const VkDynamicDepthBoundsStateCreateInfo* pCreateInfo,
+ VkDynamicDepthBoundsState* pState)
{
struct intel_dev *dev = intel_dev(device);
- return intel_depth_state_create(dev, pCreateInfo,
- (struct intel_dynamic_depth **) pState);
+ return intel_depth_bounds_state_create(dev, pCreateInfo,
+ (struct intel_dynamic_depth_bounds **) pState);
}
-ICD_EXPORT VkResult VKAPI vkDestroyDynamicDepthState(
+ICD_EXPORT VkResult VKAPI vkDestroyDynamicDepthBoundsState(
VkDevice device,
- VkDynamicDepthState dynamicDepthState)
+ VkDynamicDepthBoundsState dynamicDepthBoundsState)
{
- struct intel_obj *obj = intel_obj(dynamicDepthState.handle);
+ struct intel_obj *obj = intel_obj(dynamicDepthBoundsState.handle);
obj->destroy(obj);
return VK_SUCCESS;
diff --git a/icd/intel/state.h b/icd/intel/state.h
index bee9b05..85dc748 100644
--- a/icd/intel/state.h
+++ b/icd/intel/state.h
@@ -45,24 +45,24 @@
uint32_t cmd_scissor_rect_pos;
};
-struct intel_dynamic_raster_line {
+struct intel_dynamic_line_width {
struct intel_obj obj;
- VkDynamicRasterLineStateCreateInfo raster_line_info;
+ VkDynamicLineWidthStateCreateInfo line_width_info;
};
-struct intel_dynamic_raster_depth_bias {
+struct intel_dynamic_depth_bias {
struct intel_obj obj;
- VkDynamicRasterDepthBiasStateCreateInfo raster_depth_bias_info;
+ VkDynamicDepthBiasStateCreateInfo depth_bias_info;
};
-struct intel_dynamic_color_blend {
+struct intel_dynamic_blend {
struct intel_obj obj;
- VkDynamicColorBlendStateCreateInfo color_blend_info;
+ VkDynamicBlendStateCreateInfo blend_info;
};
-struct intel_dynamic_depth {
+struct intel_dynamic_depth_bounds {
struct intel_obj obj;
- VkDynamicDepthStateCreateInfo depth_info;
+ VkDynamicDepthBoundsStateCreateInfo depth_bounds_info;
};
struct intel_dynamic_stencil {
@@ -82,44 +82,44 @@
return (struct intel_dynamic_viewport *) obj;
}
-static inline struct intel_dynamic_raster_line *intel_dynamic_raster_line(VkDynamicRasterLineState state)
+static inline struct intel_dynamic_line_width *intel_dynamic_line_width(VkDynamicLineWidthState state)
{
- return *(struct intel_dynamic_raster_line **) &state;
+ return *(struct intel_dynamic_line_width **) &state;
}
-static inline struct intel_dynamic_raster_line *intel_raster_line_state_from_obj(struct intel_obj *obj)
+static inline struct intel_dynamic_line_width *intel_line_width_state_from_obj(struct intel_obj *obj)
{
- return (struct intel_dynamic_raster_line *) obj;
+ return (struct intel_dynamic_line_width *) obj;
}
-static inline struct intel_dynamic_raster_depth_bias *intel_dynamic_raster_depth_bias(VkDynamicRasterDepthBiasState state)
+static inline struct intel_dynamic_depth_bias *intel_dynamic_depth_bias(VkDynamicDepthBiasState state)
{
- return *(struct intel_dynamic_raster_depth_bias **) &state;
+ return *(struct intel_dynamic_depth_bias **) &state;
}
-static inline struct intel_dynamic_raster_depth_bias *intel_raster_depth_bias_state_from_obj(struct intel_obj *obj)
+static inline struct intel_dynamic_depth_bias *intel_depth_bias_state_from_obj(struct intel_obj *obj)
{
- return (struct intel_dynamic_raster_depth_bias *) obj;
+ return (struct intel_dynamic_depth_bias *) obj;
}
-static inline struct intel_dynamic_color_blend *intel_dynamic_color_blend(VkDynamicColorBlendState state)
+static inline struct intel_dynamic_blend *intel_dynamic_blend(VkDynamicBlendState state)
{
- return *(struct intel_dynamic_color_blend **) &state;
+ return *(struct intel_dynamic_blend **) &state;
}
-static inline struct intel_dynamic_color_blend *intel_blend_state_from_obj(struct intel_obj *obj)
+static inline struct intel_dynamic_blend *intel_blend_state_from_obj(struct intel_obj *obj)
{
- return (struct intel_dynamic_color_blend *) obj;
+ return (struct intel_dynamic_blend *) obj;
}
-static inline struct intel_dynamic_depth *intel_dynamic_depth(VkDynamicDepthState state)
+static inline struct intel_dynamic_depth_bounds *intel_dynamic_depth_bounds(VkDynamicDepthBoundsState state)
{
- return *(struct intel_dynamic_depth **) &state;
+ return *(struct intel_dynamic_depth_bounds **) &state;
}
-static inline struct intel_dynamic_depth *intel_depth_state_from_obj(struct intel_obj *obj)
+static inline struct intel_dynamic_depth_bounds *intel_depth_bounds_state_from_obj(struct intel_obj *obj)
{
- return (struct intel_dynamic_depth *) obj;
+ return (struct intel_dynamic_depth_bounds *) obj;
}
static inline struct intel_dynamic_stencil *intel_dynamic_stencil(VkDynamicStencilState state)
@@ -137,23 +137,23 @@
struct intel_dynamic_viewport **state_ret);
void intel_viewport_state_destroy(struct intel_dynamic_viewport *state);
-VkResult intel_raster_line_state_create(struct intel_dev *dev,
- const VkDynamicRasterLineStateCreateInfo *info,
- struct intel_dynamic_raster_line **state_ret);
-void intel_raster_line_state_destroy(struct intel_dynamic_raster_line *state);
-VkResult intel_raster_depth_bias_state_create(struct intel_dev *dev,
- const VkDynamicRasterDepthBiasStateCreateInfo *info,
- struct intel_dynamic_raster_depth_bias **state_ret);
-void intel_raster_depth_bias_state_destroy(struct intel_dynamic_raster_depth_bias *state);
+VkResult intel_line_width_state_create(struct intel_dev *dev,
+ const VkDynamicLineWidthStateCreateInfo *info,
+ struct intel_dynamic_line_width **state_ret);
+void intel_line_width_state_destroy(struct intel_dynamic_line_width *state);
+VkResult intel_depth_bias_state_create(struct intel_dev *dev,
+ const VkDynamicDepthBiasStateCreateInfo *info,
+ struct intel_dynamic_depth_bias **state_ret);
+void intel_depth_bias_state_destroy(struct intel_dynamic_depth_bias *state);
VkResult intel_blend_state_create(struct intel_dev *dev,
- const VkDynamicColorBlendStateCreateInfo *info,
- struct intel_dynamic_color_blend **state_ret);
-void intel_blend_state_destroy(struct intel_dynamic_color_blend *state);
+ const VkDynamicBlendStateCreateInfo *info,
+ struct intel_dynamic_blend **state_ret);
+void intel_blend_state_destroy(struct intel_dynamic_blend *state);
-VkResult intel_depth_state_create(struct intel_dev *dev,
- const VkDynamicDepthStateCreateInfo *info,
- struct intel_dynamic_depth **state_ret);
-void intel_depth_state_destroy(struct intel_dynamic_depth *state);
+VkResult intel_depth_bounds_state_create(struct intel_dev *dev,
+ const VkDynamicDepthBoundsStateCreateInfo *info,
+ struct intel_dynamic_depth_bounds **state_ret);
+void intel_depth_bounds_state_destroy(struct intel_dynamic_depth_bounds *state);
VkResult intel_stencil_state_create(struct intel_dev *dev,
const VkDynamicStencilStateCreateInfo *info_front,