MGislv
/
Quake3e
1
0
Fork 0
Code Releases Activity

Vulkan: use minimal VkApplicationInfo at instance creation 

Vulkan: disabled explicit layout transitions
This commit is contained in:
Eugene 2022-01-31 12:18:18 +02:00
parent 4ac4d34c7a
commit 5924248d79
5 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/renderer/tr_surface.c
View File

@ -145,6 +145,8 @@ void RB_AddQuadStamp2( float x, float y, float w, float h, float s1, float t1, f
int numIndexes;
int numVerts;
VBO_Flush();
RB_CHECKOVERFLOW( 4, 6 );
tess.surfType = SF_TRIANGLES;

2
code/renderervk/tr_backend.c
View File

@ -460,7 +460,9 @@ static void RB_Hyperspace( void ) {
RB_BeginSurface( tr.whiteShader, 0 );
}
#ifdef USE_VBO
VBO_UnBind();
#endif
RB_SetGL2D();

8
code/renderervk/tr_init.c
View File

@ -586,12 +586,16 @@ static void InitOpenGL( void )
}
#ifdef USE_VULKAN
if ( !vk.active ) {
if ( !vk.active && vk.instance ) {
// might happen after REF_KEEP_WINDOW
vk_initialize();
gls.initTime = ri.Milliseconds();
}
vk_init_descriptors();
if ( vk.active ) {
vk_init_descriptors();
} else {
ri.Error( ERR_FATAL, "Recursive error during Vulkan initialization" );
}
#endif
VarInfo();

6
code/renderervk/tr_surface.c
View File

@ -149,9 +149,15 @@ void RB_AddQuadStamp2( float x, float y, float w, float h, float s1, float t1, f
int numIndexes;
int numVerts;
#ifdef USE_VBO
VBO_Flush();
#endif
RB_CHECKOVERFLOW( 4, 6 );
#ifdef USE_VBO
tess.surfType = SF_TRIANGLES;
#endif
numIndexes = tess.numIndexes;
numVerts = tess.numVertexes;

13
code/renderervk/vk.c
View File

@ -1071,6 +1071,7 @@ static void create_instance( void )
VkResult res;
const char **extension_names, *ext;
uint32_t i, n, count, extension_count;
VkApplicationInfo appInfo;
count = 0;
extension_count = 0;
@ -1096,11 +1097,19 @@ static void create_instance( void )
extension_names[ extension_count++ ] = ext;
}
appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
appInfo.pNext = NULL;
appInfo.pApplicationName = NULL; // Q3_VERSION;
appInfo.applicationVersion = 0x0;
appInfo.pEngineName = NULL;
appInfo.engineVersion = 0x0;
appInfo.apiVersion = VK_API_VERSION_1_0;
// create instance
desc.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
desc.pNext = NULL;
desc.flags = 0;
desc.pApplicationInfo = NULL;
desc.pApplicationInfo = &appInfo;
desc.enabledExtensionCount = extension_count;
desc.ppEnabledExtensionNames = extension_names;
@ -6458,7 +6467,7 @@ void vk_begin_frame( void )
// Ensure visibility of geometry buffers writes.
//record_buffer_memory_barrier( vk.cmd->command_buffer, vk.cmd->vertex_buffer, vk.cmd->vertex_buffer_offset, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT );
#if 1
#if 0
// add explicit layout transition dependency
if ( vk.fboActive ) {
record_image_layout_transition( vk.cmd->command_buffer,