diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-04-03 16:35:32 -0600 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-04-16 17:33:25 +0800 |
| commit | 374553cbc2d26d8a523cef7dd5b11150a09129d0 (patch) | |
| tree | 8224bda78e841a6d280de342c9ee4b72f9f21a29 /include | |
| parent | 49ffd3f1ecf0d6e034ae6d5ebdc147563b7124e8 (diff) | |
| download | usermoji-374553cbc2d26d8a523cef7dd5b11150a09129d0.tar.xz | |
xgl: combine xglCmdClearColor* into one function
combined the two xglCmdClearColorImage* functions into one,
with the XGL_CLEAR_COLOR struct
bug # 13172
alpha header: r29626
Diffstat (limited to 'include')
| -rw-r--r-- | include/xgl.h | 14 | ||||
| -rw-r--r-- | include/xglLayer.h | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/include/xgl.h b/include/xgl.h index 4cea9e06..94cac948 100644 --- a/include/xgl.h +++ b/include/xgl.h @@ -33,7 +33,7 @@ #include "xglPlatform.h" // XGL API version supported by this file -#define XGL_API_VERSION XGL_MAKE_VERSION(0, 53, 0) +#define XGL_API_VERSION XGL_MAKE_VERSION(0, 54, 0) #ifdef __cplusplus extern "C" @@ -2308,8 +2308,7 @@ typedef void (XGLAPI *xglCmdCopyImageToBufferType)(XGL_CMD_BUFFER cmdBuffe typedef void (XGLAPI *xglCmdCloneImageDataType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE_LAYOUT srcImageLayout, XGL_IMAGE destImage, XGL_IMAGE_LAYOUT destImageLayout); typedef void (XGLAPI *xglCmdUpdateBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE dataSize, const uint32_t* pData); typedef void (XGLAPI *xglCmdFillBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_BUFFER destBuffer, XGL_GPU_SIZE destOffset, XGL_GPU_SIZE fillSize, uint32_t data); -typedef void (XGLAPI *xglCmdClearColorImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const float color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges); -typedef void (XGLAPI *xglCmdClearColorImageRawType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const uint32_t color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges); +typedef void (XGLAPI *xglCmdClearColorImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, XGL_CLEAR_COLOR color, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges); typedef void (XGLAPI *xglCmdClearDepthStencilType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, float depth, uint32_t stencil, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges); typedef void (XGLAPI *xglCmdResolveImageType)(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE srcImage, XGL_IMAGE destImage, uint32_t rectCount, const XGL_IMAGE_RESOLVE* pRects); typedef void (XGLAPI *xglCmdSetEventType)(XGL_CMD_BUFFER cmdBuffer, XGL_EVENT event, XGL_SET_EVENT pipeEvent); @@ -2875,14 +2874,7 @@ void XGLAPI xglCmdFillBuffer( void XGLAPI xglCmdClearColorImage( XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, - const float color[4], - uint32_t rangeCount, - const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges); - -void XGLAPI xglCmdClearColorImageRaw( - XGL_CMD_BUFFER cmdBuffer, - XGL_IMAGE image, - const uint32_t color[4], + XGL_CLEAR_COLOR color, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges); diff --git a/include/xglLayer.h b/include/xglLayer.h index d6a7fbb2..05fa5ec0 100644 --- a/include/xglLayer.h +++ b/include/xglLayer.h @@ -122,7 +122,6 @@ typedef struct _XGL_LAYER_DISPATCH_TABLE xglCmdUpdateBufferType CmdUpdateBuffer; xglCmdFillBufferType CmdFillBuffer; xglCmdClearColorImageType CmdClearColorImage; - xglCmdClearColorImageRawType CmdClearColorImageRaw; xglCmdClearDepthStencilType CmdClearDepthStencil; xglCmdResolveImageType CmdResolveImage; xglCmdSetEventType CmdSetEvent; |