Merge branch 'stable' into dev

This commit is contained in:
bjorn 2024-03-12 11:58:34 -07:00
commit 2b218d09d0
4 changed files with 57 additions and 3 deletions

View File

@ -13,7 +13,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleVersion</key>
<string>v0.17.0</string>
<string>v0.17.1</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>

View File

@ -1,5 +1,6 @@
lovr = require 'lovr'
<<<<<<< HEAD
local lovr = lovr
local conf = {
@ -51,6 +52,57 @@ local conf = {
resizable = false,
title = 'LÖVR',
icon = nil
=======
-- Note: Cannot be overloaded
function lovr.boot()
local conf = {
version = '0.17.1',
identity = 'default',
saveprecedence = true,
modules = {
audio = true,
data = true,
event = true,
graphics = true,
headset = true,
math = true,
physics = true,
system = true,
thread = true,
timer = true
},
audio = {
start = true,
spatializer = nil
},
graphics = {
debug = false,
vsync = true,
stencil = false,
antialias = true,
shadercache = true
},
headset = {
drivers = { 'openxr', 'webxr', 'desktop' },
supersample = false,
offset = 1.7,
stencil = false,
antialias = true,
submitdepth = true,
overlay = false
},
math = {
globals = true
},
window = {
width = 720,
height = 800,
fullscreen = false,
resizable = false,
title = 'LÖVR',
icon = nil
}
>>>>>>> stable
}
}

View File

@ -504,7 +504,9 @@ bool gpu_texture_init(gpu_texture* texture, gpu_texture_info* info) {
return false;
}
if (!gpu_texture_init_view(texture, &viewInfo)) {
bool needsView = info->usage & (GPU_TEXTURE_RENDER | GPU_TEXTURE_SAMPLE | GPU_TEXTURE_STORAGE);
if (needsView && !gpu_texture_init_view(texture, &viewInfo)) {
vkDestroyImage(state.device, texture->handle, NULL);
gpu_release(memory);
return false;

View File

@ -6,7 +6,7 @@
#define LOVR_VERSION_MAJOR 0
#define LOVR_VERSION_MINOR 17
#define LOVR_VERSION_PATCH 0
#define LOVR_VERSION_PATCH 1
#define LOVR_VERSION_ALIAS "Tritium Gourmet"
#ifdef _MSC_VER