mirror of
https://github.com/TheRedShip/RT_GPU.git
synced 2025-09-27 18:48:36 +02:00
~ | Better memory management
This commit is contained in:
34
srcs/RT.cpp
34
srcs/RT.cpp
@ -22,11 +22,27 @@ int main(int argc, char **argv)
|
|||||||
Window window(&scene, WIDTH, HEIGHT, "RT_GPU", 0);
|
Window window(&scene, WIDTH, HEIGHT, "RT_GPU", 0);
|
||||||
Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/compute.glsl");
|
Shader shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/compute.glsl");
|
||||||
|
|
||||||
|
GLint max_gpu_size;
|
||||||
|
glGetIntegerv(GL_MAX_SHADER_STORAGE_BLOCK_SIZE, &max_gpu_size);
|
||||||
|
|
||||||
|
const std::vector<GPUObject> &object_data = scene.getObjectData();
|
||||||
|
const std::vector<GPUMaterial> &material_data = scene.getMaterialData();
|
||||||
|
|
||||||
|
std::cout << "Sending " << object_data.size() << " objects for " << \
|
||||||
|
object_data.size() * sizeof(GPUObject) + material_data.size() * sizeof(GPUMaterial) \
|
||||||
|
<< " / " << max_gpu_size << " bytes" << std::endl;
|
||||||
|
|
||||||
GLuint objectSSBO;
|
GLuint objectSSBO;
|
||||||
glGenBuffers(1, &objectSSBO);
|
glGenBuffers(1, &objectSSBO);
|
||||||
|
glBindBuffer(GL_SHADER_STORAGE_BUFFER, objectSSBO);
|
||||||
|
glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(GPUObject) * object_data.size(), nullptr, GL_STATIC_DRAW);
|
||||||
|
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, objectSSBO);
|
||||||
|
|
||||||
GLuint materialSSBO;
|
GLuint materialSSBO;
|
||||||
glGenBuffers(1, &materialSSBO);
|
glGenBuffers(1, &materialSSBO);
|
||||||
|
glBindBuffer(GL_SHADER_STORAGE_BUFFER, materialSSBO);
|
||||||
|
glBufferData(GL_SHADER_STORAGE_BUFFER, sizeof(GPUMaterial) * material_data.size(), nullptr, GL_STATIC_DRAW);
|
||||||
|
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, materialSSBO);
|
||||||
|
|
||||||
GLuint cameraUBO;
|
GLuint cameraUBO;
|
||||||
glGenBuffers(1, &cameraUBO);
|
glGenBuffers(1, &cameraUBO);
|
||||||
@ -40,27 +56,15 @@ int main(int argc, char **argv)
|
|||||||
size_t size = sizeof(vertices) / sizeof(Vertex) / 3;
|
size_t size = sizeof(vertices) / sizeof(Vertex) / 3;
|
||||||
shader.setupVertexBuffer(vertices, size);
|
shader.setupVertexBuffer(vertices, size);
|
||||||
|
|
||||||
GLint max_gpu_size;
|
|
||||||
glGetIntegerv(GL_MAX_SHADER_STORAGE_BLOCK_SIZE, &max_gpu_size);
|
|
||||||
|
|
||||||
const std::vector<GPUObject> &object_data = scene.getObjectData();
|
|
||||||
const std::vector<GPUMaterial> &material_data = scene.getMaterialData();
|
|
||||||
std::cout << "Sending " << object_data.size() << " objects for " << \
|
|
||||||
object_data.size() * sizeof(GPUObject) + material_data.size() * sizeof(GPUMaterial) \
|
|
||||||
<< " / " << max_gpu_size << " bytes" << std::endl;
|
|
||||||
|
|
||||||
|
|
||||||
while (!window.shouldClose())
|
while (!window.shouldClose())
|
||||||
{
|
{
|
||||||
glUseProgram(shader.getProgramCompute());
|
glUseProgram(shader.getProgramCompute());
|
||||||
|
|
||||||
glBindBuffer(GL_SHADER_STORAGE_BUFFER, objectSSBO);
|
glBindBuffer(GL_SHADER_STORAGE_BUFFER, objectSSBO);
|
||||||
glBufferData(GL_SHADER_STORAGE_BUFFER, object_data.size() * sizeof(GPUObject), object_data.data(), GL_DYNAMIC_DRAW);
|
glBufferSubData(GL_SHADER_STORAGE_BUFFER, 0, object_data.size() * sizeof(GPUObject), object_data.data());
|
||||||
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 1, objectSSBO);
|
|
||||||
|
|
||||||
glBindBuffer(GL_SHADER_STORAGE_BUFFER, materialSSBO);
|
glBindBuffer(GL_SHADER_STORAGE_BUFFER, materialSSBO);
|
||||||
glBufferData(GL_SHADER_STORAGE_BUFFER, material_data.size() * sizeof(GPUMaterial), material_data.data(), GL_DYNAMIC_DRAW);
|
glBufferSubData(GL_SHADER_STORAGE_BUFFER, 0, material_data.size() * sizeof(GPUMaterial), material_data.data());
|
||||||
glBindBufferBase(GL_SHADER_STORAGE_BUFFER, 2, materialSSBO);
|
|
||||||
|
|
||||||
GPUCamera camera_data = scene.getCamera()->getGPUData();
|
GPUCamera camera_data = scene.getCamera()->getGPUData();
|
||||||
glBindBuffer(GL_UNIFORM_BUFFER, cameraUBO);
|
glBindBuffer(GL_UNIFORM_BUFFER, cameraUBO);
|
||||||
|
Reference in New Issue
Block a user