Commit Graph

446 Commits

Author SHA1 Message Date
Bjorn d1eaa43997
Merge pull request #641 from brainrom/pkgrename
Android package rename via CMake
2023-02-05 21:57:25 -08:00
Bjorn 49489dc0e8
Apply suggestions from code review 2023-02-05 21:47:52 -08:00
bjorn bf31072d0d Cleanup; 2023-01-30 19:44:23 -08:00
kokokoshka 85b6e36020 Android package rename via CMake 2023-01-30 20:35:49 +03:00
Ilya Chelyadin ca09c89d03 Updated Pico loader path to SDK v2.1.0, fixed C++ shared library path 2023-01-29 23:45:23 +03:00
Ilya 933ae3a9ba
Merge branch 'bjornbytes:master' into picofix 2023-01-29 23:33:48 +03:00
bjorn 59394c0cbc CMake: macOS links against Vulkan;
But shh in the build script we're going to make the Vulkan library
variable point to MoltenVK.
2023-01-21 15:26:36 -08:00
bjorn e042e718df CMake: macOS move_lib supports imported libraries; 2023-01-21 15:25:48 -08:00
Ilya Chelyadin ac012d39c2 Universal APK for Oculus, Pico and Generic loaders 2023-01-05 01:50:38 +03:00
Ilya f3837d99fd
Merge branch 'bjornbytes:master' into picofix 2023-01-04 23:03:54 +03:00
bjorn fe3c383247 CMake: minor fix to the move_resource function; 2022-12-30 21:24:45 -08:00
bjorn d438578c42 CMake: Windows includes lovrc.bat in builds;
Also made a nifty helper function to move resources to the build folder,
in an effort to avoid writing duplicate versions of these functions for
each platform.
2022-12-30 21:20:27 -08:00
bjorn 886e3bb42f Fix some windows warnings; 2022-12-19 14:01:30 -08:00
Ilya 5b36c44cfc
Merge branch 'bjornbytes:master' into picofix 2022-12-11 11:19:06 +03:00
bjorn 58cc96414a Add flag to omit GLFW from build; 2022-12-10 20:29:36 -08:00
bjorn f013831b73 Reorganize thread code;
- Put channel into thread module file.
- Make thread internals private.
- Handle more thread bookkeeping in thread module instead of Lua API.
- Fix a few race conditions/leaks nobody was probably ever going to hit.
2022-12-10 20:13:39 -08:00
Ilya Chelyadin f62c99e469 Fix typos, indentation, minor issues 2022-12-08 07:05:30 +03:00
Ilya 92c136bc73
Merge branch 'bjornbytes:master' into picofix 2022-12-01 21:20:33 +03:00
bjorn b4b2b56c90 CMake: Don't recompile shaders on every build;
Recompile them only when needed.
2022-11-26 14:20:09 -08:00
bjorn 23f747d4c3 Fix CMake; 2022-11-23 14:12:58 -08:00
Ilya Chelyadin 3f20364c3f Pico is back!
Tested on Pico Neo 3 with PUI v4.9.3
Also included generic (Monado-Android) Android flavor.
2022-11-22 22:01:13 +03:00
bjorn b9ef1772da LÖVR no longer depends on system-installed Vulkan;
Experimental.
2022-11-14 20:54:43 -08:00
bjorn 7d3cc45cc2 LÖVR submodule improvements;
- Allow parent CMake projects to expose symbols more easily
- Allow for custom plugins folder
- Include directories are always relative to lovr's source dir

Co-authored-by: Ilya Chelyadin <ilya77105@gmail.com>
2022-11-09 22:42:50 -08:00
bjorn b81f86b5ad rm Android flavors for now;
There used to be oculus and pico but pico doesn't work anymore.

Eventually things will converge on the standard loader and we won't
need different loaders, but manifests may require flavors.
2022-11-09 00:21:49 -08:00
Josip Miskovic 92975d34fc Cannot use Android-built glslang on desktop 2022-10-31 17:59:42 -07:00
Ryan Pavlik 7d0ac1520a Use the internal glslang submodule for compiling shaders
Fixes #579
2022-10-06 12:11:01 -07:00
bjorn ef87ec8cba CMake: Build OpenXR as dll on windows; 2022-10-02 15:07:12 -07:00
Josip Miskovic 5ab6eaadda Include openxr loader dll when enabled 2022-09-30 08:26:29 -07:00
bjorn 4f4477b6c8 CMake: Fix plugins that use static libraries; 2022-09-14 21:33:24 -07:00
bjorn 4bd316b887 CMake: Use glslangValidator executable from Vulkan SDK; 2022-08-06 18:55:40 -07:00
bjorn a2ee485d41 Fix most windows warnings in graphics code;
Co-authored-by: mcc <andi.m.mcclure@gmail.com>
2022-08-06 18:05:30 -07:00
bjorn c41188c4b4 Merge branch 'master' into dev 2022-08-06 11:08:02 -07:00
bjorn 45135899a1 Readback, mostly; 2022-07-14 00:05:58 -07:00
bjorn 0b76ab7e96 Add a few Tally things; 2022-07-12 19:59:12 -07:00
bjorn 2b7b513824 Disable OpenXR on macOS;
It doesn't seem to work.
2022-07-10 17:08:53 -06:00
mcc c34ee01c1b Fix typo in msvc warnings patch 2022-07-03 21:34:16 -07:00
mcc 15aa08bbe7 Adjustments to MSVC warnings PR based on github comments 2022-07-03 21:34:16 -07:00
mcc 28d64b6ced Fix various compiler warnings in MSVC (non graphics edition)
- Put in casts/checks in audio code when assigning size_t to 32 bit
- () is different from (void)
- Turned off warnings for anonymous unions and negating unsigned integers which were technically accurate but unhelpful (and interfered with bit conversion and a weird bit math construct in audio.c) (CMakeLists only)
2022-07-03 21:34:16 -07:00
bjorn fe31431016 rm EGL/X11; Android fixes; 2022-06-20 18:23:28 -07:00
bjorn 7def390f9c OpenXR/CMake fixes; 2022-06-20 15:51:24 -07:00
bjorn c1bb47d737 Merge branch 'master' into dev 2022-06-16 23:50:11 -07:00
bjorn 711a7df43b CMake can compile shaders; 2022-06-07 21:19:42 -07:00
bjorn 7605d0b04e CMake: always move libraries;
Instead of only moving them when lovr is rebuilt.

That way plugins get moved into bin when their source changes.
2022-06-02 20:27:35 -07:00
bjorn de30337374 core/spv; 2022-05-22 15:02:42 -07:00
bjorn 355b2bf85b Switch to glslang fork;
The reason is that the glslang C API doesn't support the extra
overloads that let you provide multiple strings or the lengths for
strings.  In our case our shader blobs are not null terminated, so
sending them to glslang would overrun the buffer.  I forked glslang
and modified the C API to support a length parameter.
2022-05-22 14:58:07 -07:00
bjorn d9e5ba8b9f Slightly broken compileShader/newShader; 2022-05-09 11:47:06 -07:00
bjorn 9ae285afa7 Add glslang; 2022-05-09 11:45:15 -07:00
bjorn fa8be29dfa Use unique subdirectories for plugins in CMake; 2022-05-06 11:11:59 -07:00
bjorn 22e15513f9 Sampler; 2022-05-01 15:47:17 -07:00
bjorn 77a32333e0 lovr.graphics.pass; 2022-04-30 18:56:38 -07:00