id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 07:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed Vulkan Swapchain error messages

Browse source
This commit is contained in:
Robert Beckebans 2018-11-01 12:14:21 +01:00
parent 80fed3c14a
commit 11ebd3641b
3 changed files with 89 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/renderer/RenderProgs.h
View file

@ -798,6 +798,8 @@ private:
idList<rpBinding_t> bindings;
idList<pipelineState_t> pipelines;
};
static void CreateDescriptorSetLayout( const shader_t& vertexShader, const shader_t& fragmentShader, renderProg_t& renderProg );
#else
struct shader_t
{

14
neo/renderer/Vulkan/RenderBackend_VK.cpp
View file

@ -1517,7 +1517,9 @@ idRenderBackend::GL_EndFrame
*/
void idRenderBackend::GL_EndFrame()
{
vkCmdEndRenderPass( vkcontext.commandBuffer[ vkcontext.currentFrameData ] );
VkCommandBuffer commandBuffer = vkcontext.commandBuffer[ vkcontext.currentFrameData ];
vkCmdEndRenderPass( commandBuffer );
// Transition our swap image to present.
// Do this instead of having the renderpass do the transition
@ -1535,17 +1537,23 @@ void idRenderBackend::GL_EndFrame()
barrier.subresourceRange.layerCount = 1;
barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL;
barrier.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
#if 0
barrier.srcAccessMask = VK_PIPELINE_STAGE_TRANSFER_BIT |
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
barrier.dstAccessMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
#else
barrier.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
barrier.dstAccessMask = 0;
#endif
vkCmdPipelineBarrier(
vkcontext.commandBuffer[ vkcontext.currentFrameData ],
commandBuffer,
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
0, 0, NULL, 0, NULL, 1, &barrier );
ID_VK_CHECK( vkEndCommandBuffer( vkcontext.commandBuffer[ vkcontext.currentFrameData ] ) )
ID_VK_CHECK( vkEndCommandBuffer( commandBuffer ) )
vkcontext.commandBufferRecorded[ vkcontext.currentFrameData ] = true;
VkSemaphore* acquire = &vkcontext.acquireSemaphores[ vkcontext.currentFrameData ];

138
neo/renderer/Vulkan/RenderProgs_VK.cpp
View file

@ -198,6 +198,81 @@ void CreateDescriptorPools( VkDescriptorPool( &pools )[ NUM_FRAME_DATA ] )
}
/*
========================
GetDescriptorType
========================
*/
static VkDescriptorType GetDescriptorType( rpBinding_t type )
{
switch( type )
{
case BINDING_TYPE_UNIFORM_BUFFER:
return VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
case BINDING_TYPE_SAMPLER:
return VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
default:
idLib::Error( "Unknown rpBinding_t %d", static_cast< int >( type ) );
return VK_DESCRIPTOR_TYPE_MAX_ENUM;
}
}
/*
========================
CreateDescriptorSetLayout
========================
*/
void idRenderProgManager::CreateDescriptorSetLayout( const shader_t& vertexShader, const shader_t& fragmentShader, renderProg_t& renderProg )
{
// Descriptor Set Layout
{
idList< VkDescriptorSetLayoutBinding > layoutBindings;
VkDescriptorSetLayoutBinding binding = {};
binding.descriptorCount = 1;
uint32 bindingId = 0;
binding.stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
for( int i = 0; i < vertexShader.bindings.Num(); ++i )
{
binding.binding = bindingId++;
binding.descriptorType = GetDescriptorType( vertexShader.bindings[ i ] );
renderProg.bindings.Append( vertexShader.bindings[ i ] );
layoutBindings.Append( binding );
}
binding.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
for( int i = 0; i < fragmentShader.bindings.Num(); ++i )
{
binding.binding = bindingId++;
binding.descriptorType = GetDescriptorType( fragmentShader.bindings[ i ] );
renderProg.bindings.Append( fragmentShader.bindings[ i ] );
layoutBindings.Append( binding );
}
VkDescriptorSetLayoutCreateInfo createInfo = {};
createInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
createInfo.bindingCount = layoutBindings.Num();
createInfo.pBindings = layoutBindings.Ptr();
vkCreateDescriptorSetLayout( vkcontext.device, &createInfo, NULL, &renderProg.descriptorSetLayout );
}
// Pipeline Layout
{
VkPipelineLayoutCreateInfo createInfo = {};
createInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
createInfo.setLayoutCount = 1;
createInfo.pSetLayouts = &renderProg.descriptorSetLayout;
vkCreatePipelineLayout( vkcontext.device, &createInfo, NULL, &renderProg.pipelineLayout );
}
}
/*
========================
idRenderProgManager::StartFrame
@ -552,67 +627,6 @@ void idRenderProgManager::LoadShader( shader_t& shader )
shaderModuleCreateInfo.pCode = ( uint32* )spirvBuffer;
ID_VK_CHECK( vkCreateShaderModule( vkcontext.device, &shaderModuleCreateInfo, NULL, &shader.module ) );
#if 0
// create and compile the shader
shader.progId = glCreateShader( glTarget );
if( shader.progId )
{
const char* source[1] = { programGLSL.c_str() };
glShaderSource( shader.progId, 1, source, NULL );
glCompileShader( shader.progId );
int infologLength = 0;
glGetShaderiv( shader.progId, GL_INFO_LOG_LENGTH, &infologLength );
if( infologLength > 1 )
{
idTempArray<char> infoLog( infologLength );
int charsWritten = 0;
glGetShaderInfoLog( shader.progId, infologLength, &charsWritten, infoLog.Ptr() );
// catch the strings the ATI and Intel drivers output on success
if( strstr( infoLog.Ptr(), "successfully compiled to run on hardware" ) != NULL ||
strstr( infoLog.Ptr(), "No errors." ) != NULL )
{
//idLib::Printf( "%s program %s from %s compiled to run on hardware\n", typeName, GetName(), GetFileName() );
}
else if( r_displayGLSLCompilerMessages.GetBool() ) // DG: check for the CVar I added above
{
idLib::Printf( "While compiling %s program %s\n", ( shader.stage == SHADER_STAGE_FRAGMENT ) ? "fragment" : "vertex" , inFile.c_str() );
const char separator = '\n';
idList<idStr> lines;
lines.Clear();
idStr source( programGLSL );
lines.Append( source );
for( int index = 0, ofs = lines[index].Find( separator ); ofs != -1; index++, ofs = lines[index].Find( separator ) )
{
lines.Append( lines[index].c_str() + ofs + 1 );
lines[index].CapLength( ofs );
}
idLib::Printf( "-----------------\n" );
for( int i = 0; i < lines.Num(); i++ )
{
idLib::Printf( "%3d: %s\n", i + 1, lines[i].c_str() );
}
idLib::Printf( "-----------------\n" );
idLib::Printf( "%s\n", infoLog.Ptr() );
}
}
GLint compiled = GL_FALSE;
glGetShaderiv( shader.progId, GL_COMPILE_STATUS, &compiled );
if( compiled == GL_FALSE )
{
glDeleteShader( shader.progId );
return;
}
}
#endif
}
/*
@ -637,7 +651,7 @@ void idRenderProgManager::LoadGLSLProgram( const int programIndex, const int ver
prog.vertexShaderIndex = vertexShaderIndex;
// TODO
//CreateDescriptorSetLayout( shaders[ vertexShaderIndex ], shaders[ fragmentShaderIndex ], prog );
CreateDescriptorSetLayout( shaders[ vertexShaderIndex ], shaders[ fragmentShaderIndex ], prog );
#if 0
// RB: removed idStr::Icmp( name, "heatHaze.vfp" ) == 0 hack