diff --git a/app/src/common/shared/com/igalia/wolvic/utils/EnvironmentUtils.java b/app/src/common/shared/com/igalia/wolvic/utils/EnvironmentUtils.java index be41655ac1..1b2d19c45b 100644 --- a/app/src/common/shared/com/igalia/wolvic/utils/EnvironmentUtils.java +++ b/app/src/common/shared/com/igalia/wolvic/utils/EnvironmentUtils.java @@ -20,7 +20,7 @@ public class EnvironmentUtils { public static final String ENVS_FOLDER = "envs"; public static final String BUILTIN_ENVS_PREFIX = "cubemap/"; - public static String[] SUPPORTED_ENV_EXTENSIONS = (DeviceType.isPicoXR() || DeviceType.isOculusBuild()) ? + public static String[] SUPPORTED_ENV_EXTENSIONS = (DeviceType.isOculusBuild()) ? new String[]{".jpg", ".png"} : new String[]{".ktx", ".jpg", ".png"}; /** @@ -209,10 +209,10 @@ public static Environment getExternalEnvironmentById(@NonNull Context context, @ */ @Nullable public static String getEnvironmentPayload(Environment env) { - // Pico4x and Meta Quest (after v69) do not support compressed textures for the cubemap. if (DeviceType.isPicoXR() || DeviceType.isOculusBuild()) { String payload = env.getPayload(); - String format = "_misc"; + // Meta Quest (after v69) do not support compressed textures for the cubemap. + String format = DeviceType.isOculusBuild() ? "_misc" : "_ktx"; int at = payload.lastIndexOf("."); return payload.substring(0, at) + format + "_srgb" + payload.substring(at); } diff --git a/app/src/main/cpp/BrowserWorld.cpp b/app/src/main/cpp/BrowserWorld.cpp index 15657fe7d6..58b3a25227 100644 --- a/app/src/main/cpp/BrowserWorld.cpp +++ b/app/src/main/cpp/BrowserWorld.cpp @@ -2028,18 +2028,17 @@ BrowserWorld::CreateSkyBox(const std::string& aBasePath, const std::string& aExt } return; } -#if PICOXR - // Pico's OpenXR runtime does not support compressed textures at the moment. Use PNGs in the - // meantime. - const std::string extension = aExtension.empty() ? ".png" : aExtension; - GLenum glFormat = GL_SRGB8_ALPHA8; -#elif OCULUSVR +#if OCULUSVR // Meta Quest (after v69) does not support compressed textures for the cubemap. const std::string extension = aExtension.empty() ? ".png" : aExtension; GLenum glFormat = GL_SRGB8_ALPHA8; #else const std::string extension = aExtension.empty() ? ".ktx" : aExtension; +#if defined(OCULUSVR) || defined(PICOXR) + GLenum glFormat = extension == ".ktx" ? GL_COMPRESSED_SRGB8_ETC2 : GL_SRGB8_ALPHA8; +#else GLenum glFormat = extension == ".ktx" ? GL_COMPRESSED_RGB8_ETC2 : GL_RGBA8; +#endif #endif const int32_t size = 1024; if (m.skybox) { diff --git a/app/src/picoxr/assets/cubemap/cyberpunk/negx_srgb.png b/app/src/picoxr/assets/cubemap/cyberpunk/negx_srgb.png deleted file mode 100644 index c10e27474e..0000000000 Binary files a/app/src/picoxr/assets/cubemap/cyberpunk/negx_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/cyberpunk/negy_srgb.png b/app/src/picoxr/assets/cubemap/cyberpunk/negy_srgb.png deleted file mode 100644 index 86e6d0c730..0000000000 Binary files a/app/src/picoxr/assets/cubemap/cyberpunk/negy_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/cyberpunk/negz_srgb.png b/app/src/picoxr/assets/cubemap/cyberpunk/negz_srgb.png deleted file mode 100644 index 7c4d203a8e..0000000000 Binary files a/app/src/picoxr/assets/cubemap/cyberpunk/negz_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/cyberpunk/posx_srgb.png b/app/src/picoxr/assets/cubemap/cyberpunk/posx_srgb.png deleted file mode 100644 index a5ad1c2331..0000000000 Binary files a/app/src/picoxr/assets/cubemap/cyberpunk/posx_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/cyberpunk/posy_srgb.png b/app/src/picoxr/assets/cubemap/cyberpunk/posy_srgb.png deleted file mode 100644 index 7e8af0ebbe..0000000000 Binary files a/app/src/picoxr/assets/cubemap/cyberpunk/posy_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/cyberpunk/posz_srgb.png b/app/src/picoxr/assets/cubemap/cyberpunk/posz_srgb.png deleted file mode 100644 index 8d5fe62650..0000000000 Binary files a/app/src/picoxr/assets/cubemap/cyberpunk/posz_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/wolvic/negx_srgb.png b/app/src/picoxr/assets/cubemap/wolvic/negx_srgb.png deleted file mode 100644 index c9a82de4be..0000000000 Binary files a/app/src/picoxr/assets/cubemap/wolvic/negx_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/wolvic/negy_srgb.png b/app/src/picoxr/assets/cubemap/wolvic/negy_srgb.png deleted file mode 100644 index 0c252039f1..0000000000 Binary files a/app/src/picoxr/assets/cubemap/wolvic/negy_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/wolvic/negz_srgb.png b/app/src/picoxr/assets/cubemap/wolvic/negz_srgb.png deleted file mode 100644 index 1a6b45d729..0000000000 Binary files a/app/src/picoxr/assets/cubemap/wolvic/negz_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/wolvic/posx_srgb.png b/app/src/picoxr/assets/cubemap/wolvic/posx_srgb.png deleted file mode 100644 index ea6bebaf1e..0000000000 Binary files a/app/src/picoxr/assets/cubemap/wolvic/posx_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/wolvic/posy_srgb.png b/app/src/picoxr/assets/cubemap/wolvic/posy_srgb.png deleted file mode 100644 index 9c373b0313..0000000000 Binary files a/app/src/picoxr/assets/cubemap/wolvic/posy_srgb.png and /dev/null differ diff --git a/app/src/picoxr/assets/cubemap/wolvic/posz_srgb.png b/app/src/picoxr/assets/cubemap/wolvic/posz_srgb.png deleted file mode 100644 index 934546fa14..0000000000 Binary files a/app/src/picoxr/assets/cubemap/wolvic/posz_srgb.png and /dev/null differ