vk/0.210.0: Rename origin fields of VkViewport

This commit is contained in:
Jason Ekstrand
2015-11-30 17:26:32 -08:00
parent 9fa6e328eb
commit 5f348bd0e5
4 changed files with 16 additions and 16 deletions

View File

@@ -1646,8 +1646,8 @@ typedef struct VkPipelineTessellationStateCreateInfo {
} VkPipelineTessellationStateCreateInfo;
typedef struct VkViewport {
float originX;
float originY;
float x;
float y;
float width;
float height;
float minDepth;

View File

@@ -601,8 +601,8 @@ meta_emit_blit(struct anv_cmd_buffer *cmd_buffer,
anv_CmdSetViewport(anv_cmd_buffer_to_handle(cmd_buffer), 1,
&(VkViewport) {
.originX = 0.0f,
.originY = 0.0f,
.x = 0.0f,
.y = 0.0f,
.width = dest_iview->extent.width,
.height = dest_iview->extent.height,
.minDepth = 0.0f,

View File

@@ -355,8 +355,8 @@ emit_load_color_clear(struct anv_cmd_buffer *cmd_buffer,
ANV_CALL(CmdSetViewport)(cmd_buffer_h, 1,
(VkViewport[]) {
{
.originX = 0,
.originY = 0,
.x = 0,
.y = 0,
.width = fb->width,
.height = fb->height,
.minDepth = 0.0,
@@ -523,8 +523,8 @@ emit_load_depthstencil_clear(struct anv_cmd_buffer *cmd_buffer,
ANV_CALL(CmdSetViewport)(cmd_buffer_h, 1,
(VkViewport[]) {
{
.originX = 0,
.originY = 0,
.x = 0,
.y = 0,
.width = fb->width,
.height = fb->height,

View File

@@ -85,17 +85,17 @@ emit_viewport_state(struct anv_cmd_buffer *cmd_buffer,
.ViewportMatrixElementm00 = vp->width / 2,
.ViewportMatrixElementm11 = vp->height / 2,
.ViewportMatrixElementm22 = (vp->maxDepth - vp->minDepth) / 2,
.ViewportMatrixElementm30 = vp->originX + vp->width / 2,
.ViewportMatrixElementm31 = vp->originY + vp->height / 2,
.ViewportMatrixElementm30 = vp->x + vp->width / 2,
.ViewportMatrixElementm31 = vp->y + vp->height / 2,
.ViewportMatrixElementm32 = (vp->maxDepth + vp->minDepth) / 2,
.XMinClipGuardband = -1.0f,
.XMaxClipGuardband = 1.0f,
.YMinClipGuardband = -1.0f,
.YMaxClipGuardband = 1.0f,
.XMinViewPort = vp->originX,
.XMaxViewPort = vp->originX + vp->width - 1,
.YMinViewPort = vp->originY,
.YMaxViewPort = vp->originY + vp->height - 1,
.XMinViewPort = vp->x,
.XMaxViewPort = vp->x + vp->width - 1,
.YMinViewPort = vp->y,
.YMaxViewPort = vp->y + vp->height - 1,
};
struct GENX(CC_VIEWPORT) cc_viewport = {
@@ -126,8 +126,8 @@ gen8_cmd_buffer_emit_viewport(struct anv_cmd_buffer *cmd_buffer)
/* If viewport count is 0, this is taken to mean "use the default" */
emit_viewport_state(cmd_buffer, 1,
&(VkViewport) {
.originX = 0.0f,
.originY = 0.0f,
.x = 0.0f,
.y = 0.0f,
.width = cmd_buffer->state.framebuffer->width,
.height = cmd_buffer->state.framebuffer->height,
.minDepth = 0.0f,