Skip to content

A
angle
Commit 06ca634e by Jamie Madill Committed by Commit Bot
Options

Vulkan: Refactor for draw call shader patching.

This refactors a few methods to enable draw call shader patching. The shader serials in the Pipeline description are inserted right before we query the pipeline cache. This is done during a draw call. Also renames the 'QueueSerial' member of the ObjectAndSerial class to just 'Serial' to more accurately reflect it usage in ShaderAndSerial. Also changes the GlslangWrapper class to have all static methods. If we need to store state we can revert these changes at some point. Also splits the GlslangWrapper link call into two static calls. One call is called to get the linked source code. The second call compiles the linked sources into shader code. Only the second call will be necessary for draw call shader patching to implement OpenGL line rasterization in Vulkan. Bug: angleproject:2598 Change-Id: I7bad3c3eeab1fb062c15a840836db4a28f841a26 Reviewed-on: https://chromium-review.googlesource.com/1127158 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent d9618bf4
Showing with 123 additions and 188 deletions
src/libANGLE/renderer/vulkan/ContextVk.cpp
...@@ -141,7 +141,7 @@ gl::Error ContextVk::finish(const gl::Context *context) ...@@ -141,7 +141,7 @@ gl::Error ContextVk::finish(const gl::Context *context)
return mRenderer->finish(this); return mRenderer->finish(this);
} }
gl::Error ContextVk::initPipeline() gl::Error ContextVk::initPipeline(const gl::DrawCallParams &drawCallParams)
{ {
ASSERT(!mCurrentPipeline); ASSERT(!mCurrentPipeline);
...@@ -161,9 +161,20 @@ gl::Error ContextVk::initPipeline() ...@@ -161,9 +161,20 @@ gl::Error ContextVk::initPipeline()
// Ensure that the RenderPass description is updated. // Ensure that the RenderPass description is updated.
mPipelineDesc->updateRenderPassDesc(framebufferVk->getRenderPassDesc()); mPipelineDesc->updateRenderPassDesc(framebufferVk->getRenderPassDesc());
// TODO(jmadill): Validate with ASSERT against physical device limits/caps? // Trigger draw call shader patching and fill out the pipeline desc.
ANGLE_TRY(mRenderer->getAppPipeline(this, programVk, *mPipelineDesc, activeAttribLocationsMask, const vk::ShaderAndSerial *vertexShaderAndSerial = nullptr;
&mCurrentPipeline)); const vk::ShaderAndSerial *fragmentShaderAndSerial = nullptr;
ANGLE_TRY(programVk->initShaders(this, drawCallParams, &vertexShaderAndSerial,
&fragmentShaderAndSerial));
mPipelineDesc->updateShaders(vertexShaderAndSerial->getSerial(),
fragmentShaderAndSerial->getSerial());
const vk::PipelineLayout &pipelineLayout = programVk->getPipelineLayout();
ANGLE_TRY(mRenderer->getPipeline(this, *vertexShaderAndSerial, *fragmentShaderAndSerial,
pipelineLayout, *mPipelineDesc, activeAttribLocationsMask,
&mCurrentPipeline));
return gl::NoError(); return gl::NoError();
} }
...@@ -181,7 +192,7 @@ gl::Error ContextVk::setupDraw(const gl::Context *context, ...@@ -181,7 +192,7 @@ gl::Error ContextVk::setupDraw(const gl::Context *context,
if (!mCurrentPipeline) if (!mCurrentPipeline)
{ {
ANGLE_TRY(initPipeline()); ANGLE_TRY(initPipeline(drawCallParams));
} }
const auto &state = mState.getState(); const auto &state = mState.getState();
...@@ -603,7 +614,6 @@ gl::Error ContextVk::syncState(const gl::Context *context, const gl::State::Dirt ...@@ -603,7 +614,6 @@ gl::Error ContextVk::syncState(const gl::Context *context, const gl::State::Dirt
case gl::State::DIRTY_BIT_RENDERBUFFER_BINDING: case gl::State::DIRTY_BIT_RENDERBUFFER_BINDING:
break; break;
case gl::State::DIRTY_BIT_VERTEX_ARRAY_BINDING: case gl::State::DIRTY_BIT_VERTEX_ARRAY_BINDING:
invalidateCurrentPipeline();
mVertexArrayBindingHasChanged = true; mVertexArrayBindingHasChanged = true;
break; break;
case gl::State::DIRTY_BIT_DRAW_INDIRECT_BUFFER_BINDING: case gl::State::DIRTY_BIT_DRAW_INDIRECT_BUFFER_BINDING:
...@@ -614,10 +624,8 @@ gl::Error ContextVk::syncState(const gl::Context *context, const gl::State::Dirt ...@@ -614,10 +624,8 @@ gl::Error ContextVk::syncState(const gl::Context *context, const gl::State::Dirt
break; break;
case gl::State::DIRTY_BIT_PROGRAM_EXECUTABLE: case gl::State::DIRTY_BIT_PROGRAM_EXECUTABLE:
{ {
ProgramVk *programVk = vk::GetImpl(glState.getProgram());
mPipelineDesc->updateShaders(programVk->getVertexModuleSerial(),
programVk->getFragmentModuleSerial());
dirtyTextures = true; dirtyTextures = true;
// No additional work is needed here. We will update the pipeline desc later.
break; break;
} }
case gl::State::DIRTY_BIT_TEXTURE_BINDINGS: case gl::State::DIRTY_BIT_TEXTURE_BINDINGS:
......
src/libANGLE/renderer/vulkan/ContextVk.h
...@@ -172,7 +172,7 @@ class ContextVk : public ContextImpl, public vk::Context ...@@ -172,7 +172,7 @@ class ContextVk : public ContextImpl, public vk::Context
void handleError(VkResult errorCode, const char *file, unsigned int line) override; void handleError(VkResult errorCode, const char *file, unsigned int line) override;
private: private:
gl::Error initPipeline(); gl::Error initPipeline(const gl::DrawCallParams &drawCallParams);
gl::Error setupDraw(const gl::Context *context, gl::Error setupDraw(const gl::Context *context,
const gl::DrawCallParams &drawCallParams, const gl::DrawCallParams &drawCallParams,
vk::CommandBuffer **commandBufferOut, vk::CommandBuffer **commandBufferOut,
......
src/libANGLE/renderer/vulkan/FramebufferVk.cpp
...@@ -1022,7 +1022,7 @@ angle::Result FramebufferVk::clearWithDraw(ContextVk *contextVk, ...@@ -1022,7 +1022,7 @@ angle::Result FramebufferVk::clearWithDraw(ContextVk *contextVk,
pipelineDesc.initDefaults(); pipelineDesc.initDefaults();
pipelineDesc.updateColorWriteMask(colorMaskFlags, getEmulatedAlphaAttachmentMask()); pipelineDesc.updateColorWriteMask(colorMaskFlags, getEmulatedAlphaAttachmentMask());
pipelineDesc.updateRenderPassDesc(getRenderPassDesc()); pipelineDesc.updateRenderPassDesc(getRenderPassDesc());
pipelineDesc.updateShaders(fullScreenQuad->queueSerial(), pushConstantColor->queueSerial()); pipelineDesc.updateShaders(fullScreenQuad->getSerial(), pushConstantColor->getSerial());
pipelineDesc.updateViewport(this, renderArea, 0.0f, 1.0f, invertViewport); pipelineDesc.updateViewport(this, renderArea, 0.0f, 1.0f, invertViewport);
const gl::State &glState = contextVk->getGLState(); const gl::State &glState = contextVk->getGLState();
...@@ -1042,9 +1042,9 @@ angle::Result FramebufferVk::clearWithDraw(ContextVk *contextVk, ...@@ -1042,9 +1042,9 @@ angle::Result FramebufferVk::clearWithDraw(ContextVk *contextVk,
} }
vk::PipelineAndSerial *pipeline = nullptr; vk::PipelineAndSerial *pipeline = nullptr;
ANGLE_TRY(renderer->getInternalPipeline(contextVk, *fullScreenQuad, *pushConstantColor, ANGLE_TRY(renderer->getPipeline(contextVk, *fullScreenQuad, *pushConstantColor,
pipelineLayout.get(), pipelineDesc, pipelineLayout.get(), pipelineDesc, gl::AttributesMask(),
gl::AttributesMask(), &pipeline)); &pipeline));
pipeline->updateSerial(renderer->getCurrentQueueSerial()); pipeline->updateSerial(renderer->getCurrentQueueSerial());
vk::CommandBuffer *writeCommands = nullptr; vk::CommandBuffer *writeCommands = nullptr;
......
src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
...@@ -121,53 +121,25 @@ std::string GetMappedSamplerName(const std::string &originalName) ...@@ -121,53 +121,25 @@ std::string GetMappedSamplerName(const std::string &originalName)
} // anonymous namespace } // anonymous namespace
// static // static
GlslangWrapper *GlslangWrapper::mInstance = nullptr; void GlslangWrapper::Initialize()
// static
GlslangWrapper *GlslangWrapper::GetReference()
{
if (!mInstance)
{
mInstance = new GlslangWrapper();
}
mInstance->addRef();
return mInstance;
}
// static
void GlslangWrapper::ReleaseReference()
{
if (mInstance->getRefCount() == 1)
{
mInstance->release();
mInstance = nullptr;
}
else
{
mInstance->release();
}
}
GlslangWrapper::GlslangWrapper()
{ {
int result = ShInitialize(); int result = ShInitialize();
ASSERT(result != 0); ASSERT(result != 0);
} }
GlslangWrapper::~GlslangWrapper() // static
void GlslangWrapper::Release()
{ {
int result = ShFinalize(); int result = ShFinalize();
ASSERT(result != 0); ASSERT(result != 0);
} }
gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext, // static
const gl::ProgramState &programState, void GlslangWrapper::GetShaderSource(const gl::Context *glContext,
const gl::ProgramLinkedResources &resources, const gl::ProgramState &programState,
const gl::Caps &glCaps, const gl::ProgramLinkedResources &resources,
std::vector<uint32_t> *vertexCodeOut, std::string *vertexSourceOut,
std::vector<uint32_t> *fragmentCodeOut) std::string *fragmentSourceOut)
{ {
gl::Shader *glVertexShader = programState.getAttachedShader(gl::ShaderType::Vertex); gl::Shader *glVertexShader = programState.getAttachedShader(gl::ShaderType::Vertex);
gl::Shader *glFragmentShader = programState.getAttachedShader(gl::ShaderType::Fragment); gl::Shader *glFragmentShader = programState.getAttachedShader(gl::ShaderType::Fragment);
...@@ -308,6 +280,17 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext, ...@@ -308,6 +280,17 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
InsertQualifierSpecifierString(&vertexSource, kDriverBlockName, kUniformQualifier); InsertQualifierSpecifierString(&vertexSource, kDriverBlockName, kUniformQualifier);
InsertQualifierSpecifierString(&fragmentSource, kDriverBlockName, kUniformQualifier); InsertQualifierSpecifierString(&fragmentSource, kDriverBlockName, kUniformQualifier);
*vertexSourceOut = vertexSource;
*fragmentSourceOut = fragmentSource;
}
// static
gl::LinkResult GlslangWrapper::GetShaderCode(const gl::Caps &glCaps,
const std::string &vertexSource,
const std::string &fragmentSource,
std::vector<uint32_t> *vertexCodeOut,
std::vector<uint32_t> *fragmentCodeOut)
{
std::array<const char *, 2> strings = {{vertexSource.c_str(), fragmentSource.c_str()}}; std::array<const char *, 2> strings = {{vertexSource.c_str(), fragmentSource.c_str()}};
std::array<int, 2> lengths = { std::array<int, 2> lengths = {
{static_cast<int>(vertexSource.length()), static_cast<int>(fragmentSource.length())}}; {static_cast<int>(vertexSource.length()), static_cast<int>(fragmentSource.length())}};
...@@ -360,5 +343,4 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext, ...@@ -360,5 +343,4 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
return true; return true;
} }
} // namespace rx } // namespace rx
src/libANGLE/renderer/vulkan/GlslangWrapper.h
...@@ -9,32 +9,29 @@ ...@@ -9,32 +9,29 @@
#ifndef LIBANGLE_RENDERER_VULKAN_GLSLANG_WRAPPER_H_ #ifndef LIBANGLE_RENDERER_VULKAN_GLSLANG_WRAPPER_H_
#define LIBANGLE_RENDERER_VULKAN_GLSLANG_WRAPPER_H_ #define LIBANGLE_RENDERER_VULKAN_GLSLANG_WRAPPER_H_
#include "libANGLE/RefCountObject.h"
#include "libANGLE/renderer/ProgramImpl.h" #include "libANGLE/renderer/ProgramImpl.h"
namespace rx namespace rx
{ {
// This class currently holds no state. If we want to hold state we would need to solve the
class GlslangWrapper : public gl::RefCountObjectNoID // potential race conditions with multiple threads.
class GlslangWrapper
{ {
public: public:
// Increases the reference count. static void Initialize();
// TODO(jmadill): Determine how to handle this atomically. static void Release();
static GlslangWrapper *GetReference();
static void ReleaseReference(); static void GetShaderSource(const gl::Context *glContext,
const gl::ProgramState &programState,
gl::LinkResult linkProgram(const gl::Context *glContext, const gl::ProgramLinkedResources &resources,
const gl::ProgramState &programState, std::string *vertexSourceOut,
const gl::ProgramLinkedResources &resources, std::string *fragmentSourceOut);
const gl::Caps &glCaps,
std::vector<uint32_t> *vertexCodeOut, static gl::LinkResult GetShaderCode(const gl::Caps &glCaps,
std::vector<uint32_t> *fragmentCodeOut); const std::string &vertexSource,
const std::string &fragmentSource,
private: std::vector<uint32_t> *vertexCodeOut,
GlslangWrapper(); std::vector<uint32_t> *fragmentCodeOut);
~GlslangWrapper() override;
static GlslangWrapper *mInstance;
}; };
} // namespace rx } // namespace rx
......
src/libANGLE/renderer/vulkan/ProgramVk.cpp
...@@ -186,10 +186,8 @@ angle::Result ProgramVk::reset(ContextVk *contextVk) ...@@ -186,10 +186,8 @@ angle::Result ProgramVk::reset(ContextVk *contextVk)
renderer->releaseObject(currentSerial, &mEmptyUniformBlockStorage.memory); renderer->releaseObject(currentSerial, &mEmptyUniformBlockStorage.memory);
renderer->releaseObject(currentSerial, &mEmptyUniformBlockStorage.buffer); renderer->releaseObject(currentSerial, &mEmptyUniformBlockStorage.buffer);
mLinkedFragmentModule.destroy(device); mDefaultVertexShaderAndSerial.destroy(device);
mLinkedVertexModule.destroy(device); mDefaultFragmentShaderAndSerial.destroy(device);
mVertexModuleSerial = Serial();
mFragmentModuleSerial = Serial();
mDescriptorSets.clear(); mDescriptorSets.clear();
mUsedDescriptorSetRange.invalidate(); mUsedDescriptorSetRange.invalidate();
...@@ -225,17 +223,20 @@ gl::LinkResult ProgramVk::link(const gl::Context *glContext, ...@@ -225,17 +223,20 @@ gl::LinkResult ProgramVk::link(const gl::Context *glContext,
const gl::ProgramLinkedResources &resources, const gl::ProgramLinkedResources &resources,
gl::InfoLog &infoLog) gl::InfoLog &infoLog)
{ {
ContextVk *contextVk = vk::GetImpl(glContext); ContextVk *contextVk = vk::GetImpl(glContext);
RendererVk *renderer = contextVk->getRenderer(); RendererVk *renderer = contextVk->getRenderer();
GlslangWrapper *glslangWrapper = renderer->getGlslangWrapper();
ANGLE_TRY(reset(contextVk)); ANGLE_TRY(reset(contextVk));
std::string vertexSource;
std::string fragmentSource;
GlslangWrapper::GetShaderSource(glContext, mState, resources, &vertexSource, &fragmentSource);
std::vector<uint32_t> vertexCode; std::vector<uint32_t> vertexCode;
std::vector<uint32_t> fragmentCode; std::vector<uint32_t> fragmentCode;
bool linkSuccess = false; bool linkSuccess = false;
ANGLE_TRY_RESULT(glslangWrapper->linkProgram(glContext, mState, resources, glContext->getCaps(), ANGLE_TRY_RESULT(GlslangWrapper::GetShaderCode(glContext->getCaps(), vertexSource,
&vertexCode, &fragmentCode), fragmentSource, &vertexCode, &fragmentCode),
linkSuccess); linkSuccess);
if (!linkSuccess) if (!linkSuccess)
{ {
...@@ -250,8 +251,8 @@ gl::LinkResult ProgramVk::link(const gl::Context *glContext, ...@@ -250,8 +251,8 @@ gl::LinkResult ProgramVk::link(const gl::Context *glContext,
vertexShaderInfo.codeSize = vertexCode.size() * sizeof(uint32_t); vertexShaderInfo.codeSize = vertexCode.size() * sizeof(uint32_t);
vertexShaderInfo.pCode = vertexCode.data(); vertexShaderInfo.pCode = vertexCode.data();
ANGLE_TRY(mLinkedVertexModule.init(contextVk, vertexShaderInfo)); ANGLE_TRY(mDefaultVertexShaderAndSerial.get().init(contextVk, vertexShaderInfo));
mVertexModuleSerial = renderer->issueShaderSerial(); mDefaultVertexShaderAndSerial.updateSerial(renderer->issueShaderSerial());
} }
{ {
...@@ -262,8 +263,8 @@ gl::LinkResult ProgramVk::link(const gl::Context *glContext, ...@@ -262,8 +263,8 @@ gl::LinkResult ProgramVk::link(const gl::Context *glContext,
fragmentShaderInfo.codeSize = fragmentCode.size() * sizeof(uint32_t); fragmentShaderInfo.codeSize = fragmentCode.size() * sizeof(uint32_t);
fragmentShaderInfo.pCode = fragmentCode.data(); fragmentShaderInfo.pCode = fragmentCode.data();
ANGLE_TRY(mLinkedFragmentModule.init(contextVk, fragmentShaderInfo)); ANGLE_TRY(mDefaultFragmentShaderAndSerial.get().init(contextVk, fragmentShaderInfo));
mFragmentModuleSerial = renderer->issueShaderSerial(); mDefaultFragmentShaderAndSerial.updateSerial(renderer->issueShaderSerial());
} }
ANGLE_TRY(initDefaultUniformBlocks(glContext)); ANGLE_TRY(initDefaultUniformBlocks(glContext));
...@@ -717,26 +718,18 @@ void ProgramVk::setPathFragmentInputGen(const std::string &inputName, ...@@ -717,26 +718,18 @@ void ProgramVk::setPathFragmentInputGen(const std::string &inputName,
UNIMPLEMENTED(); UNIMPLEMENTED();
} }
const vk::ShaderModule &ProgramVk::getLinkedVertexModule() const gl::Error ProgramVk::initShaders(const ContextVk *contextVk,
const gl::DrawCallParams &drawCallParams,
const vk::ShaderAndSerial **vertexShaderAndSerialOut,
const vk::ShaderAndSerial **fragmentShaderAndSerialOut)
{ {
ASSERT(mLinkedVertexModule.getHandle() != VK_NULL_HANDLE); // TODO(jmadill): Move more init into this method. http://anglebug.com/2598
return mLinkedVertexModule; // TODO(jmadill): Line rasterization emulation shaders. http://anglebug.com/2598
} ASSERT(mDefaultVertexShaderAndSerial.valid());
ASSERT(mDefaultFragmentShaderAndSerial.valid());
Serial ProgramVk::getVertexModuleSerial() const *vertexShaderAndSerialOut = &mDefaultVertexShaderAndSerial;
{ *fragmentShaderAndSerialOut = &mDefaultFragmentShaderAndSerial;
return mVertexModuleSerial; return gl::NoError();
}
const vk::ShaderModule &ProgramVk::getLinkedFragmentModule() const
{
ASSERT(mLinkedFragmentModule.getHandle() != VK_NULL_HANDLE);
return mLinkedFragmentModule;
}
Serial ProgramVk::getFragmentModuleSerial() const
{
return mFragmentModuleSerial;
} }
angle::Result ProgramVk::allocateDescriptorSet(ContextVk *contextVk, uint32_t descriptorSetIndex) angle::Result ProgramVk::allocateDescriptorSet(ContextVk *contextVk, uint32_t descriptorSetIndex)
......
src/libANGLE/renderer/vulkan/ProgramVk.h
...@@ -99,10 +99,11 @@ class ProgramVk : public ProgramImpl ...@@ -99,10 +99,11 @@ class ProgramVk : public ProgramImpl
GLint components, GLint components,
const GLfloat *coeffs) override; const GLfloat *coeffs) override;
const vk::ShaderModule &getLinkedVertexModule() const; // Also initializes the pipeline layout, descriptor set layouts, and used descriptor ranges.
Serial getVertexModuleSerial() const; gl::Error initShaders(const ContextVk *contextVk,
const vk::ShaderModule &getLinkedFragmentModule() const; const gl::DrawCallParams &drawCallParams,
Serial getFragmentModuleSerial() const; const vk::ShaderAndSerial **vertexShaderAndSerialOut,
const vk::ShaderAndSerial **fragmentShaderAndSerialOut);
angle::Result updateUniforms(ContextVk *contextVk); angle::Result updateUniforms(ContextVk *contextVk);
...@@ -144,10 +145,8 @@ class ProgramVk : public ProgramImpl ...@@ -144,10 +145,8 @@ class ProgramVk : public ProgramImpl
template <typename T> template <typename T>
void setUniformImpl(GLint location, GLsizei count, const T *v, GLenum entryPointType); void setUniformImpl(GLint location, GLsizei count, const T *v, GLenum entryPointType);
vk::ShaderModule mLinkedVertexModule; vk::ShaderAndSerial mDefaultVertexShaderAndSerial;
Serial mVertexModuleSerial; vk::ShaderAndSerial mDefaultFragmentShaderAndSerial;
vk::ShaderModule mLinkedFragmentModule;
Serial mFragmentModuleSerial;
// State for the default uniform blocks. // State for the default uniform blocks.
struct DefaultUniformBlock final : private angle::NonCopyable struct DefaultUniformBlock final : private angle::NonCopyable
......
src/libANGLE/renderer/vulkan/RendererVk.cpp
...@@ -259,7 +259,6 @@ RendererVk::RendererVk() ...@@ -259,7 +259,6 @@ RendererVk::RendererVk()
mQueue(VK_NULL_HANDLE), mQueue(VK_NULL_HANDLE),
mCurrentQueueFamilyIndex(std::numeric_limits<uint32_t>::max()), mCurrentQueueFamilyIndex(std::numeric_limits<uint32_t>::max()),
mDevice(VK_NULL_HANDLE), mDevice(VK_NULL_HANDLE),
mGlslangWrapper(nullptr),
mLastCompletedQueueSerial(mQueueSerialFactory.generate()), mLastCompletedQueueSerial(mQueueSerialFactory.generate()),
mCurrentQueueSerial(mQueueSerialFactory.generate()) mCurrentQueueSerial(mQueueSerialFactory.generate())
{ {
...@@ -284,11 +283,7 @@ void RendererVk::onDestroy(vk::Context *context) ...@@ -284,11 +283,7 @@ void RendererVk::onDestroy(vk::Context *context)
mPipelineCache.destroy(mDevice); mPipelineCache.destroy(mDevice);
mShaderLibrary.destroy(mDevice); mShaderLibrary.destroy(mDevice);
if (mGlslangWrapper) GlslangWrapper::Release();
{
GlslangWrapper::ReleaseReference();
mGlslangWrapper = nullptr;
}
if (mCommandPool.valid()) if (mCommandPool.valid())
{ {
...@@ -469,7 +464,7 @@ angle::Result RendererVk::initialize(vk::Context *context, ...@@ -469,7 +464,7 @@ angle::Result RendererVk::initialize(vk::Context *context,
// Store the physical device memory properties so we can find the right memory pools. // Store the physical device memory properties so we can find the right memory pools.
mMemoryProperties.init(mPhysicalDevice); mMemoryProperties.init(mPhysicalDevice);
mGlslangWrapper = GlslangWrapper::GetReference(); GlslangWrapper::Initialize();
// Initialize the format table. // Initialize the format table.
mFormatTable.initialize(mPhysicalDevice, &mNativeTextureCaps, mFormatTable.initialize(mPhysicalDevice, &mNativeTextureCaps,
...@@ -830,11 +825,6 @@ angle::Result RendererVk::submitFrame(vk::Context *context, ...@@ -830,11 +825,6 @@ angle::Result RendererVk::submitFrame(vk::Context *context,
return angle::Result::Continue(); return angle::Result::Continue();
} }
GlslangWrapper *RendererVk::getGlslangWrapper() const
{
return mGlslangWrapper;
}
Serial RendererVk::getCurrentQueueSerial() const Serial RendererVk::getCurrentQueueSerial() const
{ {
return mCurrentQueueSerial; return mCurrentQueueSerial;
...@@ -902,39 +892,17 @@ Serial RendererVk::issueShaderSerial() ...@@ -902,39 +892,17 @@ Serial RendererVk::issueShaderSerial()
return mShaderSerialFactory.generate(); return mShaderSerialFactory.generate();
} }
angle::Result RendererVk::getAppPipeline(vk::Context *context, angle::Result RendererVk::getPipeline(vk::Context *context,
const ProgramVk *programVk, const vk::ShaderAndSerial &vertexShader,
const vk::PipelineDesc &desc, const vk::ShaderAndSerial &fragmentShader,
const gl::AttributesMask &activeAttribLocationsMask, const vk::PipelineLayout &pipelineLayout,
vk::PipelineAndSerial **pipelineOut) const vk::PipelineDesc &pipelineDesc,
{ const gl::AttributesMask &activeAttribLocationsMask,
ASSERT(programVk->getVertexModuleSerial() == vk::PipelineAndSerial **pipelineOut)
desc.getShaderStageInfo()[vk::ShaderType::VertexShader].moduleSerial);
ASSERT(programVk->getFragmentModuleSerial() ==
desc.getShaderStageInfo()[vk::ShaderType::FragmentShader].moduleSerial);
// Pull in a compatible RenderPass.
vk::RenderPass *compatibleRenderPass = nullptr;
ANGLE_TRY(getCompatibleRenderPass(context, desc.getRenderPassDesc(), &compatibleRenderPass));
const vk::PipelineLayout &pipelineLayout = programVk->getPipelineLayout();
return mPipelineCache.getPipeline(context, *compatibleRenderPass, pipelineLayout,
activeAttribLocationsMask, programVk->getLinkedVertexModule(),
programVk->getLinkedFragmentModule(), desc, pipelineOut);
}
angle::Result RendererVk::getInternalPipeline(vk::Context *context,
const vk::ShaderAndSerial &vertexShader,
const vk::ShaderAndSerial &fragmentShader,
const vk::PipelineLayout &pipelineLayout,
const vk::PipelineDesc &pipelineDesc,
const gl::AttributesMask &activeAttribLocationsMask,
vk::PipelineAndSerial **pipelineOut)
{ {
ASSERT(vertexShader.queueSerial() == ASSERT(vertexShader.getSerial() ==
pipelineDesc.getShaderStageInfo()[vk::ShaderType::VertexShader].moduleSerial); pipelineDesc.getShaderStageInfo()[vk::ShaderType::VertexShader].moduleSerial);
ASSERT(fragmentShader.queueSerial() == ASSERT(fragmentShader.getSerial() ==
pipelineDesc.getShaderStageInfo()[vk::ShaderType::FragmentShader].moduleSerial); pipelineDesc.getShaderStageInfo()[vk::ShaderType::FragmentShader].moduleSerial);
// Pull in a compatible RenderPass. // Pull in a compatible RenderPass.
......
src/libANGLE/renderer/vulkan/RendererVk.h
...@@ -28,7 +28,6 @@ class AttributeMap; ...@@ -28,7 +28,6 @@ class AttributeMap;
namespace rx namespace rx
{ {
class FramebufferVk; class FramebufferVk;
class GlslangWrapper;
namespace vk namespace vk
{ {
...@@ -75,8 +74,6 @@ class RendererVk : angle::NonCopyable ...@@ -75,8 +74,6 @@ class RendererVk : angle::NonCopyable
const gl::Limitations &getNativeLimitations() const; const gl::Limitations &getNativeLimitations() const;
uint32_t getMaxActiveTextures(); uint32_t getMaxActiveTextures();
GlslangWrapper *getGlslangWrapper() const;
Serial getCurrentQueueSerial() const; Serial getCurrentQueueSerial() const;
bool isSerialInUse(Serial serial) const; bool isSerialInUse(Serial serial) const;
...@@ -114,21 +111,14 @@ class RendererVk : angle::NonCopyable ...@@ -114,21 +111,14 @@ class RendererVk : angle::NonCopyable
const vk::AttachmentOpsArray &ops, const vk::AttachmentOpsArray &ops,
vk::RenderPass **renderPassOut); vk::RenderPass **renderPassOut);
// For getting a vk::Pipeline for the an application's draw call. RenderPassDesc is automatic. // For getting a vk::Pipeline and checking the pipeline cache.
angle::Result getAppPipeline(vk::Context *context, angle::Result getPipeline(vk::Context *context,
const ProgramVk *programVk, const vk::ShaderAndSerial &vertexShader,
const vk::PipelineDesc &desc, const vk::ShaderAndSerial &fragmentShader,
const gl::AttributesMask &activeAttribLocationsMask, const vk::PipelineLayout &pipelineLayout,
vk::PipelineAndSerial **pipelineOut); const vk::PipelineDesc &pipelineDesc,
const gl::AttributesMask &activeAttribLocationsMask,
// For getting a vk::Pipeline for an internal draw call. Use an explicit RenderPass. vk::PipelineAndSerial **pipelineOut);
angle::Result getInternalPipeline(vk::Context *context,
const vk::ShaderAndSerial &vertexShader,
const vk::ShaderAndSerial &fragmentShader,
const vk::PipelineLayout &pipelineLayout,
const vk::PipelineDesc &pipelineDesc,
const gl::AttributesMask &activeAttribLocationsMask,
vk::PipelineAndSerial **pipelineOut);
// Queries the descriptor set layout cache. Creates the layout if not present. // Queries the descriptor set layout cache. Creates the layout if not present.
angle::Result getDescriptorSetLayout( angle::Result getDescriptorSetLayout(
...@@ -180,7 +170,6 @@ class RendererVk : angle::NonCopyable ...@@ -180,7 +170,6 @@ class RendererVk : angle::NonCopyable
uint32_t mCurrentQueueFamilyIndex; uint32_t mCurrentQueueFamilyIndex;
VkDevice mDevice; VkDevice mDevice;
vk::CommandPool mCommandPool; vk::CommandPool mCommandPool;
GlslangWrapper *mGlslangWrapper;
SerialFactory mQueueSerialFactory; SerialFactory mQueueSerialFactory;
SerialFactory mShaderSerialFactory; SerialFactory mShaderSerialFactory;
Serial mLastCompletedQueueSerial; Serial mLastCompletedQueueSerial;
......
src/libANGLE/renderer/vulkan/vk_utils.h
...@@ -611,37 +611,36 @@ class ObjectAndSerial final : angle::NonCopyable ...@@ -611,37 +611,36 @@ class ObjectAndSerial final : angle::NonCopyable
public: public:
ObjectAndSerial() {} ObjectAndSerial() {}
ObjectAndSerial(ObjT &&object, Serial queueSerial) ObjectAndSerial(ObjT &&object, Serial serial) : mObject(std::move(object)), mSerial(serial) {}
: mObject(std::move(object)), mQueueSerial(queueSerial)
{
}
ObjectAndSerial(ObjectAndSerial &&other) ObjectAndSerial(ObjectAndSerial &&other)
: mObject(std::move(other.mObject)), mQueueSerial(std::move(other.mQueueSerial)) : mObject(std::move(other.mObject)), mSerial(std::move(other.mSerial))
{ {
} }
ObjectAndSerial &operator=(ObjectAndSerial &&other) ObjectAndSerial &operator=(ObjectAndSerial &&other)
{ {
mObject = std::move(other.mObject); mObject = std::move(other.mObject);
mQueueSerial = std::move(other.mQueueSerial); mSerial = std::move(other.mSerial);
return *this; return *this;
} }
Serial queueSerial() const { return mQueueSerial; } Serial getSerial() const { return mSerial; }
void updateSerial(Serial newSerial) void updateSerial(Serial newSerial) { mSerial = newSerial; }
{
ASSERT(newSerial >= mQueueSerial);
mQueueSerial = newSerial;
}
const ObjT &get() const { return mObject; } const ObjT &get() const { return mObject; }
ObjT &get() { return mObject; } ObjT &get() { return mObject; }
bool valid() const { return mObject.valid(); } bool valid() const { return mObject.valid(); }
void destroy(VkDevice device)
{
mObject.destroy(device);
mSerial = Serial();
}
private: private:
ObjT mObject; ObjT mObject;
Serial mQueueSerial; Serial mSerial;
}; };
angle::Result AllocateBufferMemory(vk::Context *context, angle::Result AllocateBufferMemory(vk::Context *context,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment