diff options
| author | Jason Ekstrand <[email protected]> | 2015-11-30 17:26:32 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-03 13:43:52 -0800 |
| commit | 5f348bd0e59e545d10dc1cab8495ddc0d3e72fea (patch) | |
| tree | 8de304ee47c5169ff45f6d7b5a9f4d296acb0a70 | |
| parent | 9fa6e328ebac4616148a23a7a4fbe7ed25ec315f (diff) | |
vk/0.210.0: Rename origin fields of VkViewport
| -rw-r--r-- | include/vulkan/vulkan.h | 4 | ||||
| -rw-r--r-- | src/vulkan/anv_meta.c | 4 | ||||
| -rw-r--r-- | src/vulkan/anv_meta_clear.c | 8 | ||||
| -rw-r--r-- | src/vulkan/gen8_cmd_buffer.c | 16 |
4 files changed, 16 insertions, 16 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 34470999bbf..49241de1863 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -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; diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index f28775e0f7a..7a9d631e876 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -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, diff --git a/src/vulkan/anv_meta_clear.c b/src/vulkan/anv_meta_clear.c index 1403d7d0c3d..091f7632e97 100644 --- a/src/vulkan/anv_meta_clear.c +++ b/src/vulkan/anv_meta_clear.c @@ -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, diff --git a/src/vulkan/gen8_cmd_buffer.c b/src/vulkan/gen8_cmd_buffer.c index c4ac28373e5..bdccee8a7b7 100644 --- a/src/vulkan/gen8_cmd_buffer.c +++ b/src/vulkan/gen8_cmd_buffer.c @@ -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, |