mirror of https://github.com/bjornbytes/lovr.git
Fix potential crash when creating textures;
beginFrame needs to be called a little bit earlier (before getting the buffer to write the texture contents).
This commit is contained in:
parent
6d382c2f0c
commit
b33cc99374
|
@ -1255,6 +1255,8 @@ Texture* lovrTextureCreate(const TextureInfo* info) {
|
||||||
uint32_t levelSizes[16];
|
uint32_t levelSizes[16];
|
||||||
gpu_buffer* scratchpad = NULL;
|
gpu_buffer* scratchpad = NULL;
|
||||||
|
|
||||||
|
beginFrame();
|
||||||
|
|
||||||
if (info->imageCount > 0) {
|
if (info->imageCount > 0) {
|
||||||
levelCount = lovrImageGetLevelCount(info->images[0]);
|
levelCount = lovrImageGetLevelCount(info->images[0]);
|
||||||
lovrCheck(info->type != TEXTURE_3D || levelCount == 1, "Images used to initialize 3D textures can not have mipmaps");
|
lovrCheck(info->type != TEXTURE_3D || levelCount == 1, "Images used to initialize 3D textures can not have mipmaps");
|
||||||
|
@ -1284,8 +1286,6 @@ Texture* lovrTextureCreate(const TextureInfo* info) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
beginFrame();
|
|
||||||
|
|
||||||
gpu_texture_init(texture->gpu, &(gpu_texture_info) {
|
gpu_texture_init(texture->gpu, &(gpu_texture_info) {
|
||||||
.type = (gpu_texture_type) info->type,
|
.type = (gpu_texture_type) info->type,
|
||||||
.format = (gpu_texture_format) info->format,
|
.format = (gpu_texture_format) info->format,
|
||||||
|
|
Loading…
Reference in New Issue