Vulkan API fixes

This commit is contained in:
Jack Andersen 2017-11-18 15:31:05 -10:00
parent 98bf80a9b9
commit de9159ce51
1 changed files with 4 additions and 2 deletions

View File

@ -1350,6 +1350,7 @@ class VulkanTextureD : public GraphicsDataNode<ITextureD>
size_t m_height; size_t m_height;
TextureFormat m_fmt; TextureFormat m_fmt;
VulkanCommandQueue* m_q; VulkanCommandQueue* m_q;
VulkanContext* m_ctx;
std::unique_ptr<uint8_t[]> m_stagingBuf; std::unique_ptr<uint8_t[]> m_stagingBuf;
size_t m_cpuSz; size_t m_cpuSz;
VkDeviceSize m_srcRowPitch; VkDeviceSize m_srcRowPitch;
@ -1358,7 +1359,7 @@ class VulkanTextureD : public GraphicsDataNode<ITextureD>
int m_validSlots = 0; int m_validSlots = 0;
VulkanTextureD(const boo::ObjToken<BaseGraphicsData>& parent, VulkanCommandQueue* q, VulkanContext* ctx, VulkanTextureD(const boo::ObjToken<BaseGraphicsData>& parent, VulkanCommandQueue* q, VulkanContext* ctx,
size_t width, size_t height, TextureFormat fmt, TextureClampMode clampMode) size_t width, size_t height, TextureFormat fmt, TextureClampMode clampMode)
: GraphicsDataNode<ITextureD>(parent), m_width(width), m_height(height), m_fmt(fmt), m_q(q) : GraphicsDataNode<ITextureD>(parent), m_width(width), m_height(height), m_fmt(fmt), m_q(q), m_ctx(ctx)
{ {
VkFormat pfmt; VkFormat pfmt;
switch (fmt) switch (fmt)
@ -1702,11 +1703,12 @@ class VulkanTextureR : public GraphicsDataNode<ITextureR>
m_passBeginInfo.pClearValues = nullptr; m_passBeginInfo.pClearValues = nullptr;
} }
VulkanContext* m_ctx;
VulkanCommandQueue* m_q; VulkanCommandQueue* m_q;
VulkanTextureR(const boo::ObjToken<BaseGraphicsData>& parent, VulkanContext* ctx, VulkanCommandQueue* q, VulkanTextureR(const boo::ObjToken<BaseGraphicsData>& parent, VulkanContext* ctx, VulkanCommandQueue* q,
size_t width, size_t height, size_t samples, TextureClampMode clampMode, size_t width, size_t height, size_t samples, TextureClampMode clampMode,
size_t colorBindCount, size_t depthBindCount) size_t colorBindCount, size_t depthBindCount)
: GraphicsDataNode<ITextureR>(parent), m_q(q), : GraphicsDataNode<ITextureR>(parent), m_ctx(ctx), m_q(q),
m_width(width), m_height(height), m_samples(samples), m_width(width), m_height(height), m_samples(samples),
m_clampMode(clampMode), m_clampMode(clampMode),
m_colorBindCount(colorBindCount), m_colorBindCount(colorBindCount),