xgl: Add IMAGE_LAYOUT to Cmd*Image* calls
This is part 2 of bug #12904.
(2) Blit operations need to know what layout images are in. How do they figure that out?
- Added new parameter(s) specifying the image layout(s) to the following functions:
xglCmdCopyImage
xglCmdCopyBufferToImage
xglCmdCopyImageToBuffer
xglCmdClearColorImage
xglCmdClearColorImageRaw
xglCmdClearDepthStencilImage
xglCmdResolveImage
diff --git a/icd/intel/cmd_meta.c b/icd/intel/cmd_meta.c
index 7a82d55..8677835 100644
--- a/icd/intel/cmd_meta.c
+++ b/icd/intel/cmd_meta.c
@@ -470,7 +470,9 @@
ICD_EXPORT void XGLAPI xglCmdCopyImage(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE srcImage,
+ XGL_IMAGE_LAYOUT srcImageLayout,
XGL_IMAGE destImage,
+ XGL_IMAGE_LAYOUT destImageLayout,
uint32_t regionCount,
const XGL_IMAGE_COPY* pRegions)
{
@@ -555,9 +557,9 @@
ICD_EXPORT void XGLAPI xglCmdBlitImage(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE srcImage,
- XGL_IMAGE_LAYOUT srcLayout,
+ XGL_IMAGE_LAYOUT srcImageLayout,
XGL_IMAGE destImage,
- XGL_IMAGE_LAYOUT destLayout,
+ XGL_IMAGE_LAYOUT destImageLayout,
uint32_t regionCount,
const XGL_IMAGE_BLIT* pRegions)
{
@@ -573,6 +575,7 @@
XGL_CMD_BUFFER cmdBuffer,
XGL_BUFFER srcBuffer,
XGL_IMAGE destImage,
+ XGL_IMAGE_LAYOUT destImageLayout,
uint32_t regionCount,
const XGL_BUFFER_IMAGE_COPY* pRegions)
{
@@ -623,6 +626,7 @@
ICD_EXPORT void XGLAPI xglCmdCopyImageToBuffer(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE srcImage,
+ XGL_IMAGE_LAYOUT srcImageLayout,
XGL_BUFFER destBuffer,
uint32_t regionCount,
const XGL_BUFFER_IMAGE_COPY* pRegions)
@@ -923,6 +927,7 @@
ICD_EXPORT void XGLAPI xglCmdClearColorImage(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE image,
+ XGL_IMAGE_LAYOUT imageLayout,
XGL_CLEAR_COLOR clearColor,
uint32_t rangeCount,
const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
@@ -958,6 +963,7 @@
ICD_EXPORT void XGLAPI xglCmdClearDepthStencil(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE image,
+ XGL_IMAGE_LAYOUT imageLayout,
float depth,
uint32_t stencil,
uint32_t rangeCount,
@@ -991,7 +997,9 @@
ICD_EXPORT void XGLAPI xglCmdResolveImage(
XGL_CMD_BUFFER cmdBuffer,
XGL_IMAGE srcImage,
+ XGL_IMAGE_LAYOUT srcImageLayout,
XGL_IMAGE destImage,
+ XGL_IMAGE_LAYOUT destImageLayout,
uint32_t rectCount,
const XGL_IMAGE_RESOLVE* pRects)
{