Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vulkan: Adjust allocation strategy #197

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Vulkan: Adjust allocation strategy #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cdf8ed
change transfer buffer allocation behavior
thatcosmonaut Feb 1, 2024
275cfdb
no more ignored memory flags
thatcosmonaut Feb 2, 2024
8ea1712
prefer CACHED bit on buffer allocation
thatcosmonaut Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 24 additions & 68 deletions src/FNA3D_CommandBuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,12 @@
#include <SDL.h>

#define STARTING_TRANSFER_BUFFER_SIZE 8000000 /* 8MB */
#define FAST_TRANSFER_SIZE 64000000 /* 64MB */

typedef struct FNA3D_TransferBufferPool
{
FNA3D_TransferBuffer *fastTransferBuffer;
uint8_t fastTransferBufferAvailable;

FNA3D_TransferBuffer **availableSlowTransferBuffers;
uint32_t availableSlowTransferBufferCount;
uint32_t availableSlowTransferBufferCapacity;
FNA3D_TransferBuffer **availableTransferBuffers;
uint32_t availableTransferBufferCount;
uint32_t availableTransferBufferCapacity;
} FNA3D_TransferBufferPool;

/* Command buffers have various resources associated with them
Expand Down Expand Up @@ -225,24 +221,17 @@ static void FNA3D_CommandBuffer_CleanContainer(
transferBuffer = container->transferBuffers[i];
transferBuffer->offset = 0;

if (transferBuffer == manager->transferBufferPool.fastTransferBuffer)
if (manager->transferBufferPool.availableTransferBufferCount == manager->transferBufferPool.availableTransferBufferCapacity)
{
manager->transferBufferPool.fastTransferBufferAvailable = 1;
manager->transferBufferPool.availableTransferBufferCapacity += 1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm guessing we have so few of these that growing by 1 is fine instead of by larger amounts or a ratio?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, these are allocated infrequently

manager->transferBufferPool.availableTransferBuffers = SDL_realloc(
manager->transferBufferPool.availableTransferBuffers,
manager->transferBufferPool.availableTransferBufferCapacity * sizeof(FNA3D_TransferBuffer*)
);
}
else
{
if (manager->transferBufferPool.availableSlowTransferBufferCount == manager->transferBufferPool.availableSlowTransferBufferCapacity)
{
manager->transferBufferPool.availableSlowTransferBufferCapacity += 1;
manager->transferBufferPool.availableSlowTransferBuffers = SDL_realloc(
manager->transferBufferPool.availableSlowTransferBuffers,
manager->transferBufferPool.availableSlowTransferBufferCapacity * sizeof(FNA3D_TransferBuffer*)
);
}

manager->transferBufferPool.availableSlowTransferBuffers[manager->transferBufferPool.availableSlowTransferBufferCount] = transferBuffer;
manager->transferBufferPool.availableSlowTransferBufferCount += 1;
}
manager->transferBufferPool.availableTransferBuffers[manager->transferBufferPool.availableTransferBufferCount] = transferBuffer;
manager->transferBufferPool.availableTransferBufferCount += 1;
}
container->transferBufferCount = 0;

Expand Down Expand Up @@ -315,21 +304,10 @@ FNA3D_CommandBufferManager* FNA3D_CreateCommandBufferManager(
* Initialize buffer space
*/

manager->transferBufferPool.fastTransferBuffer = (FNA3D_TransferBuffer*) SDL_malloc(
sizeof(FNA3D_TransferBuffer)
);
manager->transferBufferPool.fastTransferBuffer->offset = 0;
manager->transferBufferPool.fastTransferBuffer->buffer = manager->driver.CreateTransferBuffer(
manager->driver.driverData,
FAST_TRANSFER_SIZE,
1
);
manager->transferBufferPool.fastTransferBufferAvailable = 1;

manager->transferBufferPool.availableSlowTransferBufferCapacity = 4;
manager->transferBufferPool.availableSlowTransferBufferCount = 0;
manager->transferBufferPool.availableSlowTransferBuffers = (FNA3D_TransferBuffer**) SDL_malloc(
manager->transferBufferPool.availableSlowTransferBufferCapacity * sizeof(FNA3D_TransferBuffer*)
manager->transferBufferPool.availableTransferBufferCapacity = 4;
manager->transferBufferPool.availableTransferBufferCount = 0;
manager->transferBufferPool.availableTransferBuffers = (FNA3D_TransferBuffer**) SDL_malloc(
manager->transferBufferPool.availableTransferBufferCapacity * sizeof(FNA3D_TransferBuffer*)
);

return manager;
Expand Down Expand Up @@ -382,22 +360,16 @@ void FNA3D_DestroyCommandBufferManager(
SDL_free(commandBufferContainer);
}

manager->driver.DestroyBuffer(
manager->driver.driverData,
manager->transferBufferPool.fastTransferBuffer->buffer
);
SDL_free(manager->transferBufferPool.fastTransferBuffer);

for (i = 0; i < manager->transferBufferPool.availableSlowTransferBufferCount; i += 1)
for (i = 0; i < manager->transferBufferPool.availableTransferBufferCount; i += 1)
{
manager->driver.DestroyBuffer(
manager->driver.driverData,
manager->transferBufferPool.availableSlowTransferBuffers[i]->buffer
manager->transferBufferPool.availableTransferBuffers[i]->buffer
);

SDL_free(manager->transferBufferPool.availableSlowTransferBuffers[i]);
SDL_free(manager->transferBufferPool.availableTransferBuffers[i]);
}
SDL_free(manager->transferBufferPool.availableSlowTransferBuffers);
SDL_free(manager->transferBufferPool.availableTransferBuffers);

SDL_DestroyMutex(manager->commandLock);
SDL_DestroyMutex(manager->transferLock);
Expand Down Expand Up @@ -759,24 +731,9 @@ FNA3D_TransferBuffer* FNA3D_CommandBuffer_AcquireTransferBuffer(
);
}

/* Is the fast transfer buffer available? */
if ( manager->transferBufferPool.fastTransferBufferAvailable &&
requiredSize < FAST_TRANSFER_SIZE )
{
transferBuffer = manager->transferBufferPool.fastTransferBuffer;
manager->transferBufferPool.fastTransferBufferAvailable = 0;

commandBufferContainer->transferBuffers[commandBufferContainer->transferBufferCount] = transferBuffer;
commandBufferContainer->transferBufferCount += 1;

/* If the fast transfer buffer is available, the offset is always zero */
return transferBuffer;
}

/* Nope, let's get a slow buffer */
for (i = 0; i < manager->transferBufferPool.availableSlowTransferBufferCount; i += 1)
for (i = 0; i < manager->transferBufferPool.availableTransferBufferCount; i += 1)
{
transferBuffer = manager->transferBufferPool.availableSlowTransferBuffers[i];
transferBuffer = manager->transferBufferPool.availableTransferBuffers[i];
parentBufferSize = manager->driver.GetBufferSize(
manager->driver.driverData,
transferBuffer->buffer
Expand All @@ -788,8 +745,8 @@ FNA3D_TransferBuffer* FNA3D_CommandBuffer_AcquireTransferBuffer(
commandBufferContainer->transferBuffers[commandBufferContainer->transferBufferCount] = transferBuffer;
commandBufferContainer->transferBufferCount += 1;

manager->transferBufferPool.availableSlowTransferBuffers[i] = manager->transferBufferPool.availableSlowTransferBuffers[manager->transferBufferPool.availableSlowTransferBufferCount - 1];
manager->transferBufferPool.availableSlowTransferBufferCount -= 1;
manager->transferBufferPool.availableTransferBuffers[i] = manager->transferBufferPool.availableTransferBuffers[manager->transferBufferPool.availableTransferBufferCount - 1];
manager->transferBufferPool.availableTransferBufferCount -= 1;

transferBuffer->offset = offset;
return transferBuffer;
Expand All @@ -809,8 +766,7 @@ FNA3D_TransferBuffer* FNA3D_CommandBuffer_AcquireTransferBuffer(
transferBuffer->offset = 0;
transferBuffer->buffer = manager->driver.CreateTransferBuffer(
manager->driver.driverData,
size,
0
size
);

if (transferBuffer->buffer == NULL)
Expand Down
3 changes: 1 addition & 2 deletions src/FNA3D_CommandBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ typedef struct FNA3D_CommandBufferDriver

FNA3D_BufferHandle* (*CreateTransferBuffer)(
FNA3D_Renderer *driverData,
size_t size,
uint8_t preferDeviceLocal
size_t size
);

void (*IncBufferRef)(
Expand Down
Loading
Loading