mewin/sdl_gpu_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Texcoords

Browse Source
This commit is contained in:
Patrick
2024-09-14 00:26:19 +02:00
parent 660a6cedea
commit 65dd335859
5 changed files with 92 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
private/sdl_gpu_test/SModule
View File

@@ -7,9 +7,11 @@ src_files = Split("""
shader_files = Split("""
#assets/shaders/glsl/color_from_uniform.frag
#assets/shaders/glsl/color_from_texcoord.frag
#assets/shaders/glsl/green.frag
#assets/shaders/glsl/triangle.vert
#assets/shaders/glsl/triangles_from_buffer.vert
#assets/shaders/glsl/textured_triangles_from_buffer.vert
""")
env.Append(CPPDEFINES = ['GLM_FORCE_DEPTH_ZERO_TO_ONE', 'GLM_FORCE_RADIANS'])

85
private/sdl_gpu_test/main.cpp
View File

@@ -15,6 +15,12 @@
namespace
{
struct Vertex
{
glm::vec2 pos;
glm::vec2 texCoord;
};
mijin::StackedFileSystemAdapter gFileSystem;
void initFileSystem(const fs::path& executablePath) noexcept
@@ -43,6 +49,33 @@ mijin::TypelessBuffer getFileContentsBinary(const fs::path& path)
mijin::throwOnError(stream->readRest(content), "Error reading file contents.");
return content;
}
template<typename TVertex>
void uploadVertexData(const sdlpp::GPUDevice& gpuDevice, const sdlpp::GPUBuffer& vertexBuffer, std::span<TVertex> vertices)
{
sdlpp::GPUTransferBuffer transferBuffer;
transferBuffer.create(gpuDevice, {
.usage = sdlpp::GPUTransferBufferUsage::UPLOAD,
.size = static_cast<Uint32>(vertices.size_bytes())
});
void* ptr = transferBuffer.map();
std::memcpy(ptr, vertices.data(), vertices.size_bytes());
transferBuffer.unmap();
sdlpp::GPUCommandBuffer cmdBuffer = gpuDevice.acquireCommandBuffer();
sdlpp::GPUCopyPass copyPass = cmdBuffer.beginCopyPass();
copyPass.uploadToGPUBuffer(
/* source = */ {
.transferBuffer = transferBuffer
},
/* destination = */ {
.buffer = vertexBuffer,
.size = static_cast<Uint32>(vertices.size_bytes())
}
);
copyPass.end();
cmdBuffer.submit();
}
}
int main(int argc, char* argv[])
@@ -67,7 +100,7 @@ int main(int argc, char* argv[])
sdlpp::Window window;
window.create({
.title = "SDL_gpu Test",
.flags = {.vulkan = true}
.flags = {.resizable = true}
});
sdlpp::GPUDevice gpuDevice;
@@ -79,7 +112,7 @@ int main(int argc, char* argv[])
gpuDevice.claimWindow(window);
// create vertex shader
mijin::TypelessBuffer vertexSpv = getFileContentsBinary("shaders/glsl/triangles_from_buffer.vert.spv");
mijin::TypelessBuffer vertexSpv = getFileContentsBinary("shaders/glsl/textured_triangles_from_buffer.vert.spv");
sdlpp::GPUShader vertexShader;
vertexShader.create(gpuDevice, {
.code = {static_cast<const Uint8*>(vertexSpv.data()), vertexSpv.byteSize()},
@@ -88,7 +121,7 @@ int main(int argc, char* argv[])
});
// create fragment shader
mijin::TypelessBuffer fragmentSpv = getFileContentsBinary("shaders/glsl/color_from_uniform.frag.spv");
mijin::TypelessBuffer fragmentSpv = getFileContentsBinary("shaders/glsl/color_from_texcoord.frag.spv");
sdlpp::GPUShader fragmentShader;
fragmentShader.create(gpuDevice, {
.code = {static_cast<const Uint8*>(fragmentSpv.data()), fragmentSpv.byteSize()},
@@ -107,7 +140,7 @@ int main(int argc, char* argv[])
std::array vertexBindings = {
sdlpp::GPUVertexBinding{
.index = 0,
.pitch = sizeof(glm::vec2)
.pitch = sizeof(Vertex)
}
};
std::array vertexAttributes = {
@@ -115,7 +148,13 @@ int main(int argc, char* argv[])
.location = 0,
.bindingIndex = 0,
.format = sdlpp::GPUVertexElementFormat::FLOAT2,
.offset = 0
.offset = offsetof(Vertex, pos)
},
sdlpp::GPUVertexAttribute{
.location = 1,
.bindingIndex = 0,
.format = sdlpp::GPUVertexElementFormat::FLOAT2,
.offset = offsetof(Vertex, texCoord)
}
};
pipeline.create(gpuDevice, {
@@ -132,9 +171,9 @@ int main(int argc, char* argv[])
std::array vertices =
{
glm::vec2{-1.f, -1.f},
glm::vec2{ 1.f, -1.f},
glm::vec2{ 0.f, 1.f}
Vertex{.pos = {-1.f, -1.f}, .texCoord = {0.f, 0.f}},
Vertex{.pos = { 1.f, -1.f}, .texCoord = {1.f, 0.f}},
Vertex{.pos = { 0.f, 1.f}, .texCoord = {0.5f, 1.f}}
};
// create vertex buffer
@@ -143,31 +182,7 @@ int main(int argc, char* argv[])
.usage = {.vertex = true},
.size = sizeof(vertices)
});
{
sdlpp::GPUTransferBuffer transferBuffer;
transferBuffer.create(gpuDevice, {
.usage = sdlpp::GPUTransferBufferUsage::UPLOAD,
.size = sizeof(vertices)
});
void* ptr = transferBuffer.map();
std::memcpy(ptr, vertices.data(), sizeof(vertices));
transferBuffer.unmap();
sdlpp::GPUCommandBuffer cmdBuffer = gpuDevice.acquireCommandBuffer();
sdlpp::GPUCopyPass copyPass = cmdBuffer.beginCopyPass();
copyPass.uploadToGPUBuffer(
/* source = */ {
.transferBuffer = transferBuffer
},
/* destination = */ {
.buffer = vertexBuffer,
.size = sizeof(vertices)
}
);
copyPass.end();
cmdBuffer.submit();
}
uploadVertexData(gpuDevice, vertexBuffer, std::span(vertices.begin(), vertices.end()));
bool running = true;
while(running)
@@ -192,8 +207,8 @@ int main(int argc, char* argv[])
sdlpp::GPURenderPass renderPass = cmdBuffer.beginRenderPass({
.colorTargetInfos = colorTargets
});
static const glm::vec4 BLUE(0.f, 0.f, 1.f, 1.f);
cmdBuffer.pushFragmentUniformData(0, std::span(&BLUE, 1));
static const glm::vec4 WHITE(1.f, 1.f, 1.f, 1.f);
cmdBuffer.pushFragmentUniformData(0, std::span(&WHITE, 1));
renderPass.bindGraphicsPipeline(pipeline);
renderPass.bindVertexBuffer({.buffer = vertexBuffer});
renderPass.drawPrimitives({.numVertices = 3});