v156: Bug 14451 - Rename dynamic state objects
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(