misc: Fix tiler rebase in driver, tests, include

diff --git a/include/xgl.h b/include/xgl.h
index 282409130749c221d5324920a3de73477570609b..d1ae21d0919a2e28bfe0837ccb0e39d05c7495cb 100644 (file)
--- a/include/xgl.h
+++ b/include/xgl.h
@@ -1901,7 +1901,7 @@ typedef XGL_RESULT (XGLAPI *xglCreateMsaaStateType)(XGL_DEVICE device, const XGL
 typedef XGL_RESULT (XGLAPI *xglCreateColorBlendStateType)(XGL_DEVICE device, const XGL_COLOR_BLEND_STATE_CREATE_INFO* pCreateInfo, XGL_COLOR_BLEND_STATE_OBJECT* pState);
 typedef XGL_RESULT (XGLAPI *xglCreateDepthStencilStateType)(XGL_DEVICE device, const XGL_DEPTH_STENCIL_STATE_CREATE_INFO* pCreateInfo, XGL_DEPTH_STENCIL_STATE_OBJECT* pState);
 typedef XGL_RESULT (XGLAPI *xglCreateCommandBufferType)(XGL_DEVICE device, const XGL_CMD_BUFFER_CREATE_INFO* pCreateInfo, XGL_CMD_BUFFER* pCmdBuffer);
-typedef XGL_RESULT (XGLAPI *xglBeginCommandBufferType)(XGL_CMD_BUFFER cmdBuffer, XGL_FLAGS flags);
+typedef XGL_RESULT (XGLAPI *xglBeginCommandBufferType)(XGL_CMD_BUFFER cmdBuffer, const XGL_CMD_BUFFER_BEGIN_INFO* pBeginInfo);
 typedef XGL_RESULT (XGLAPI *xglEndCommandBufferType)(XGL_CMD_BUFFER cmdBuffer);
 typedef XGL_RESULT (XGLAPI *xglResetCommandBufferType)(XGL_CMD_BUFFER cmdBuffer);
 typedef XGL_VOID (XGLAPI *xglCmdBindPipelineType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_PIPELINE pipeline);
@@ -1911,7 +1911,6 @@ typedef XGL_VOID (XGLAPI *xglCmdBindDescriptorSetType)(XGL_CMD_BUFFER cmdBuffer,
 typedef XGL_VOID (XGLAPI *xglCmdBindDynamicMemoryViewType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, const XGL_MEMORY_VIEW_ATTACH_INFO* pMemView);
 typedef XGL_VOID (XGLAPI *xglCmdBindVertexDataType)(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_UINT binding);
 typedef XGL_VOID (XGLAPI *xglCmdBindIndexDataType)(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_MEMORY mem, XGL_GPU_SIZE offset, XGL_INDEX_TYPE indexType);
-typedef XGL_VOID (XGLAPI *xglCmdBindAttachmentsType)(XGL_CMD_BUFFER cmdBuffer, XGL_UINT colorAttachmentCount, const XGL_COLOR_ATTACHMENT_BIND_INFO* pColorAttachments, const XGL_DEPTH_STENCIL_BIND_INFO* pDepthStencilAttachment);
 typedef XGL_VOID (XGLAPI *xglCmdPrepareMemoryRegionsType)(XGL_CMD_BUFFER cmdBuffer, XGL_UINT transitionCount, const XGL_MEMORY_STATE_TRANSITION* pStateTransitions);
 typedef XGL_VOID (XGLAPI *xglCmdPrepareImagesType)(XGL_CMD_BUFFER cmdBuffer, XGL_UINT transitionCount, const XGL_IMAGE_STATE_TRANSITION* pStateTransitions);
 typedef XGL_VOID (XGLAPI *xglCmdDrawType)(XGL_CMD_BUFFER cmdBuffer, XGL_UINT firstVertex, XGL_UINT vertexCount, XGL_UINT firstInstance, XGL_UINT instanceCount);
@@ -1941,6 +1940,8 @@ typedef XGL_VOID (XGLAPI *xglCmdWriteTimestampType)(XGL_CMD_BUFFER cmdBuffer, XG
 typedef XGL_VOID (XGLAPI *xglCmdInitAtomicCountersType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, const XGL_UINT32* pData);
 typedef XGL_VOID (XGLAPI *xglCmdLoadAtomicCountersType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, XGL_GPU_MEMORY srcMem, XGL_GPU_SIZE srcOffset);
 typedef XGL_VOID (XGLAPI *xglCmdSaveAtomicCountersType)(XGL_CMD_BUFFER cmdBuffer, XGL_PIPELINE_BIND_POINT pipelineBindPoint, XGL_UINT startCounter, XGL_UINT counterCount, XGL_GPU_MEMORY destMem, XGL_GPU_SIZE destOffset);
+typedef XGL_RESULT (XGLAPI *xglCreateFramebufferType)(XGL_DEVICE device, const XGL_FRAMEBUFFER_CREATE_INFO* pCreateInfo, XGL_FRAMEBUFFER* pFramebuffer);
+typedef XGL_RESULT (XGLAPI *xglCreateRenderPassType)(XGL_DEVICE device, const XGL_RENDER_PASS_CREATE_INFO* pCreateInfo, XGL_RENDER_PASS* pRenderPass);
 
 #ifdef XGL_PROTOTYPES
 
@@ -2570,12 +2571,12 @@ XGL_VOID XGLAPI xglCmdSaveAtomicCounters(
     XGL_GPU_MEMORY                              destMem,
     XGL_GPU_SIZE                                destOffset);
 
-XGL_RESULT xglCreateFramebuffer(
+XGL_RESULT XGLAPI xglCreateFramebuffer(
     XGL_DEVICE                                  device,
     const XGL_FRAMEBUFFER_CREATE_INFO*          pCreateInfo,
     XGL_FRAMEBUFFER*                            pFramebuffer);
 
-XGL_RESULT xglCreateRenderPass(
+XGL_RESULT XGLAPI xglCreateRenderPass(
     XGL_DEVICE                                  device,
     const XGL_RENDER_PASS_CREATE_INFO*          pCreateInfo,
     XGL_RENDER_PASS*                            pRenderPass);

diff --git a/include/xglLayer.h b/include/xglLayer.h
index 3b462b6893e340c04f0ed478ced714abffe25e1e..6061d899fe82a1d2dca39280a39ad6c493897d48 100644 (file)
--- a/include/xglLayer.h
+++ b/include/xglLayer.h
@@ -103,7 +103,6 @@ typedef struct _XGL_LAYER_DISPATCH_TABLE
     xglCmdBindDynamicMemoryViewType CmdBindDynamicMemoryView;
     xglCmdBindVertexDataType CmdBindVertexData;
     xglCmdBindIndexDataType CmdBindIndexData;
-    xglCmdBindAttachmentsType CmdBindAttachments;
     xglCmdPrepareMemoryRegionsType CmdPrepareMemoryRegions;
     xglCmdPrepareImagesType CmdPrepareImages;
     xglCmdDrawType CmdDraw;
@@ -133,6 +132,8 @@ typedef struct _XGL_LAYER_DISPATCH_TABLE
     xglCmdInitAtomicCountersType CmdInitAtomicCounters;
     xglCmdLoadAtomicCountersType CmdLoadAtomicCounters;
     xglCmdSaveAtomicCountersType CmdSaveAtomicCounters;
+    xglCreateFramebufferType CreateFramebuffer;
+    xglCreateRenderPassType CreateRenderPass;
     xglDbgSetValidationLevelType DbgSetValidationLevel;
     xglDbgRegisterMsgCallbackType DbgRegisterMsgCallback;
     xglDbgUnregisterMsgCallbackType DbgUnregisterMsgCallback;

diff --git a/xgl.py b/xgl.py
index 3a8ac1b93557c3e867971841287f5339b8ee77d4..2297f945a2ca51a81f4715e2d7f5994a6c41d8e3 100644 (file)
--- a/xgl.py
+++ b/xgl.py
@@ -209,6 +209,8 @@ core = Extension(
         "XGL_QUEUE_SEMAPHORE",
         "XGL_EVENT",
         "XGL_QUERY_POOL",
+        "XGL_FRAMEBUFFER",
+        "XGL_RENDER_PASS"
     ],
     protos=[
         Proto("XGL_RESULT", "InitAndEnumerateGpus",
@@ -556,7 +558,7 @@ core = Extension(
 
         Proto("XGL_RESULT", "BeginCommandBuffer",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
-             Param("XGL_FLAGS", "flags")]),
+             Param("const XGL_CMD_BUFFER_BEGIN_INFO*", "pBeginInfo")]),
 
         Proto("XGL_RESULT", "EndCommandBuffer",
             [Param("XGL_CMD_BUFFER", "cmdBuffer")]),
@@ -603,12 +605,6 @@ core = Extension(
              Param("XGL_GPU_SIZE", "offset"),
              Param("XGL_INDEX_TYPE", "indexType")]),
 
-        Proto("XGL_VOID", "CmdBindAttachments",
-            [Param("XGL_CMD_BUFFER", "cmdBuffer"),
-             Param("XGL_UINT", "colorAttachmentCount"),
-             Param("const XGL_COLOR_ATTACHMENT_BIND_INFO*", "pColorAttachments"),
-             Param("const XGL_DEPTH_STENCIL_BIND_INFO*", "pDepthStencilAttachment")]),
-
         Proto("XGL_VOID", "CmdPrepareMemoryRegions",
             [Param("XGL_CMD_BUFFER", "cmdBuffer"),
              Param("XGL_UINT", "transitionCount"),
@@ -798,6 +794,16 @@ core = Extension(
              Param("XGL_GPU_MEMORY", "destMem"),
              Param("XGL_GPU_SIZE", "destOffset")]),
 
+        Proto("XGL_RESULT", "CreateFramebuffer",
+            [Param("XGL_DEVICE", "device"),
+             Param("const XGL_FRAMEBUFFER_CREATE_INFO*", "pCreateInfo"),
+             Param("XGL_FRAMEBUFFER*", "pFramebuffer")]),
+
+        Proto("XGL_RESULT", "CreateRenderPass",
+            [Param("XGL_DEVICE", "device"),
+             Param("const XGL_RENDER_PASS_CREATE_INFO*", "pCreateInfo"),
+             Param("XGL_RENDER_PASS*", "pRenderPass")]),
+
         Proto("XGL_RESULT", "DbgSetValidationLevel",
             [Param("XGL_DEVICE", "device"),
              Param("XGL_VALIDATION_LEVEL", "validationLevel")]),