lpnf
/
lovr
mirror of https://github.com/bjornbytes/lovr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rm ability to send resources by slot number;

This commit is contained in:
bjorn 2024-02-05 15:03:28 -08:00
parent 93348499e9
commit 45eba2fe85
3 changed files with 33 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/api/l_graphics_pass.c
View File

@ -643,15 +643,9 @@ static int l_lovrPassSetWireframe(lua_State* L) {
static int l_lovrPassSend(lua_State* L) {
Pass* pass = luax_checktype(L, 1, Pass);
const char* name = NULL;
size_t length = 0;
uint32_t slot = ~0u;
switch (lua_type(L, 2)) {
case LUA_TSTRING: name = lua_tolstring(L, 2, &length); break;
case LUA_TNUMBER: slot = lua_tointeger(L, 2) - 1; break;
default: return luax_typeerror(L, 2, "string or number");
}
size_t length;
const char* name = lua_tolstring(L, 2, &length);
if (lua_isnoneornil(L, 3)) {
return luax_typeerror(L, 3, "Buffer, Texture, Sampler, number, vector, table, or boolean");
@ -662,27 +656,27 @@ static int l_lovrPassSend(lua_State* L) {
if (buffer) {
uint32_t offset = lua_tointeger(L, 4);
uint32_t extent = lua_tointeger(L, 5);
lovrPassSendBuffer(pass, name, length, slot, buffer, offset, extent);
lovrPassSendBuffer(pass, name, length, buffer, offset, extent);
return 0;
}
Texture* texture = luax_totype(L, 3, Texture);
if (texture) {
lovrPassSendTexture(pass, name, length, slot, texture);
lovrPassSendTexture(pass, name, length, texture);
return 0;
}
Sampler* sampler = luax_totype(L, 3, Sampler);
if (sampler) {
lovrPassSendSampler(pass, name, length, slot, sampler);
lovrPassSendSampler(pass, name, length, sampler);
return 0;
}
void* pointer;
DataField* format;
lovrPassSendData(pass, name, length, slot, &pointer, &format);
lovrPassSendData(pass, name, length, &pointer, &format);
char* data = pointer;
// Coerce booleans since they aren't supported in buffer formats

55
src/modules/graphics/graphics.c
View File

@ -626,7 +626,7 @@ static bool supportsSRGB(TextureFormat format);
static uint32_t measureTexture(TextureFormat format, uint32_t w, uint32_t h, uint32_t d);
static void checkTextureBounds(const TextureInfo* info, uint32_t offset[4], uint32_t extent[3]);
static void mipmapTexture(gpu_stream* stream, Texture* texture, uint32_t base, uint32_t count);
static ShaderResource* findShaderResource(Shader* shader, const char* name, size_t length, uint32_t slot);
static ShaderResource* findShaderResource(Shader* shader, const char* name, size_t length);
static Access* getNextAccess(Pass* pass, int type, bool texture);
static void trackBuffer(Pass* pass, Buffer* buffer, gpu_phase phase, gpu_cache cache);
static void trackTexture(Pass* pass, Texture* texture, gpu_phase phase, gpu_cache cache);
@ -5705,13 +5705,13 @@ void lovrPassSetWireframe(Pass* pass, bool wireframe) {
}
}
void lovrPassSendBuffer(Pass* pass, const char* name, size_t length, uint32_t slot, Buffer* buffer, uint32_t offset, uint32_t extent) {
void lovrPassSendBuffer(Pass* pass, const char* name, size_t length, Buffer* buffer, uint32_t offset, uint32_t extent) {
Shader* shader = pass->pipeline->shader;
lovrCheck(shader, "A Shader must be active to send resources");
ShaderResource* resource = findShaderResource(shader, name, length, slot);
slot = resource->binding;
ShaderResource* resource = findShaderResource(shader, name, length);
uint32_t slot = resource->binding;
lovrCheck(shader->bufferMask & (1u << slot), "Trying to send a Buffer to slot %d, but the active Shader doesn't have a Buffer in that slot");
lovrCheck(shader->bufferMask & (1u << slot), "Trying to send a Buffer to '%s', but the active Shader doesn't have a Buffer in that slot", name);
lovrCheck(offset < buffer->info.size, "Buffer offset is past the end of the Buffer");
uint32_t limit;
@ -5739,13 +5739,13 @@ void lovrPassSendBuffer(Pass* pass, const char* name, size_t length, uint32_t sl
pass->flags |= DIRTY_BINDINGS;
}
void lovrPassSendTexture(Pass* pass, const char* name, size_t length, uint32_t slot, Texture* texture) {
void lovrPassSendTexture(Pass* pass, const char* name, size_t length, Texture* texture) {
Shader* shader = pass->pipeline->shader;
lovrCheck(shader, "A Shader must be active to send resources");
ShaderResource* resource = findShaderResource(shader, name, length, slot);
slot = resource->binding;
ShaderResource* resource = findShaderResource(shader, name, length);
uint32_t slot = resource->binding;
lovrCheck(shader->textureMask & (1u << slot), "Trying to send a Texture to slot %d, but the active Shader doesn't have a Texture in that slot");
lovrCheck(shader->textureMask & (1u << slot), "Trying to send a Texture to '%s', but the active Shader doesn't have a Texture in that slot", name);
gpu_texture* view = texture->gpu;
if (shader->storageMask & (1u << slot)) {
@ -5761,20 +5761,20 @@ void lovrPassSendTexture(Pass* pass, const char* name, size_t length, uint32_t s
pass->flags |= DIRTY_BINDINGS;
}
void lovrPassSendSampler(Pass* pass, const char* name, size_t length, uint32_t slot, Sampler* sampler) {
void lovrPassSendSampler(Pass* pass, const char* name, size_t length, Sampler* sampler) {
Shader* shader = pass->pipeline->shader;
lovrCheck(shader, "A Shader must be active to send resources");
ShaderResource* resource = findShaderResource(shader, name, length, slot);
slot = resource->binding;
ShaderResource* resource = findShaderResource(shader, name, length);
uint32_t slot = resource->binding;
lovrCheck(shader->samplerMask & (1u << slot), "Trying to send a Sampler to slot %d, but the active Shader doesn't have a Sampler in that slot");
lovrCheck(shader->samplerMask & (1u << slot), "Trying to send a Sampler to '%s', but the active Shader doesn't have a Sampler in that slot", name);
pass->bindings[slot].sampler = sampler->gpu;
pass->bindingMask |= (1u << slot);
pass->flags |= DIRTY_BINDINGS;
}
void lovrPassSendData(Pass* pass, const char* name, size_t length, uint32_t slot, void** data, DataField** format) {
void lovrPassSendData(Pass* pass, const char* name, size_t length, void** data, DataField** format) {
Shader* shader = pass->pipeline->shader;
lovrCheck(shader, "A Shader must be active to send data to it");
@ -5788,10 +5788,10 @@ void lovrPassSendData(Pass* pass, const char* name, size_t length, uint32_t slot
}
}
ShaderResource* resource = findShaderResource(shader, name, length, slot);
slot = resource->binding;
ShaderResource* resource = findShaderResource(shader, name, length);
uint32_t slot = resource->binding;
lovrCheck(shader->bufferMask & (1u << slot), "Trying to send data to slot %d, but that slot isn't a Buffer");
lovrCheck(shader->bufferMask & (1u << slot), "Trying to send data to '%s', but that slot isn't a Buffer", name);
lovrCheck(~shader->storageMask & (1u << slot), "Unable to send table data to a storage buffer");
uint32_t size = resource->format->stride * MAX(resource->format->length, 1);
@ -7638,23 +7638,14 @@ static void mipmapTexture(gpu_stream* stream, Texture* texture, uint32_t base, u
}
}
static ShaderResource* findShaderResource(Shader* shader, const char* name, size_t length, uint32_t slot) {
if (name) {
uint32_t hash = (uint32_t) hash64(name, length);
for (uint32_t i = 0; i < shader->resourceCount; i++) {
if (shader->resources[i].hash == hash) {
return &shader->resources[i];
}
static ShaderResource* findShaderResource(Shader* shader, const char* name, size_t length) {
uint32_t hash = (uint32_t) hash64(name, length);
for (uint32_t i = 0; i < shader->resourceCount; i++) {
if (shader->resources[i].hash == hash) {
return &shader->resources[i];
}
lovrThrow("Shader has no variable named '%s'", name);
} else {
for (uint32_t i = 0; i < shader->resourceCount; i++) {
if (shader->resources[i].binding == slot) {
return &shader->resources[i];
}
}
lovrThrow("Shader has no variable in slot '%d'", slot);
}
lovrThrow("Shader has no variable named '%s'", name);
}
static Access* getNextAccess(Pass* pass, int type, bool texture) {

8
src/modules/graphics/graphics.h
View File

@ -608,10 +608,10 @@ void lovrPassSetViewCull(Pass* pass, bool enable);
void lovrPassSetWinding(Pass* pass, Winding winding);
void lovrPassSetWireframe(Pass* pass, bool wireframe);
void lovrPassSendBuffer(Pass* pass, const char* name, size_t length, uint32_t slot, Buffer* buffer, uint32_t offset, uint32_t extent);
void lovrPassSendTexture(Pass* pass, const char* name, size_t length, uint32_t slot, Texture* texture);
void lovrPassSendSampler(Pass* pass, const char* name, size_t length, uint32_t slot, Sampler* sampler);
void lovrPassSendData(Pass* pass, const char* name, size_t length, uint32_t slot, void** data, DataField** format);
void lovrPassSendBuffer(Pass* pass, const char* name, size_t length, Buffer* buffer, uint32_t offset, uint32_t extent);
void lovrPassSendTexture(Pass* pass, const char* name, size_t length, Texture* texture);
void lovrPassSendSampler(Pass* pass, const char* name, size_t length, Sampler* sampler);
void lovrPassSendData(Pass* pass, const char* name, size_t length, void** data, DataField** format);
void lovrPassPoints(Pass* pass, uint32_t count, float** vertices);
void lovrPassLine(Pass* pass, uint32_t count, float** vertices);