From 828374f2362e1f96e1f95a1af4910763da21d85b Mon Sep 17 00:00:00 2001 From: XxJSONDeruloxX Date: Thu, 15 Oct 2026 16:55:42 -0400 Subject: [PATCH] feat: accept sRGB compositor frames --- app/src/main/cpp/questxr/quest_xr.cpp | 9 +++++---- tools/vr/src/xr_frame.h | 4 +++- tools/vr/tests/test_xr_frames.cpp | 3 +++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/main/cpp/questxr/quest_xr.cpp b/app/src/main/cpp/questxr/quest_xr.cpp index 4e9f52b02..c31ec541f 100644 --- a/app/src/main/cpp/questxr/quest_xr.cpp +++ b/app/src/main/cpp/questxr/quest_xr.cpp @@ -198,8 +198,9 @@ private: } const char *extensions = reinterpret_cast(glGetString(GL_EXTENSIONS)); const bool srgbControl = extensions && std::strstr(extensions, "GL_EXT_sRGB_write_control"); - std::fprintf(output, "],\"sourceImage\":true,\"sourceColorSpace\":\"linear\",\"sourceEncoding\":%d,\"eyeEncoding\":%d," - "\"srgbWriteControl\":%s,\"srgbWriteEnabled\":%s}\n", sourceEncoding_, eyeEncoding_, + std::fprintf(output, "],\"sourceImage\":true,\"sourceColorSpace\":\"%s\",\"sourceEncoding\":%d,\"eyeEncoding\":%d," + "\"srgbWriteControl\":%s,\"srgbWriteEnabled\":%s}\n", + sourceHeader_.color_space == DROIDDECK_XR_COLOR_SRGB_RGBA8 ? "srgb" : "linear", sourceEncoding_, eyeEncoding_, srgbControl ? "true" : "false", srgbControl && glIsEnabled(0x8DB9) ? "true" : "false"); if (std::fclose(output) == 0) std::rename(temporary.c_str(), file.c_str()); } @@ -535,8 +536,8 @@ private: if (frame.header.width > static_cast(maximum) || frame.header.height > static_cast(maximum)) throw std::runtime_error("XR source exceeds GPU texture limit"); glBindTexture(GL_TEXTURE_2D, sourceTexture_); - // Direct-mode output is linear; the sRGB eye framebuffer performs the display encoding. - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, frame.header.width, frame.header.height, 0, + GLenum encoding = frame.header.color_space == DROIDDECK_XR_COLOR_SRGB_RGBA8 ? GL_SRGB8_ALPHA8 : GL_RGBA8; + glTexImage2D(GL_TEXTURE_2D, 0, encoding, frame.header.width, frame.header.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, frame.pixels.data()); if (verifyPixels_) { glBindFramebuffer(GL_FRAMEBUFFER, framebuffer_); diff --git a/tools/vr/src/xr_frame.h b/tools/vr/src/xr_frame.h index 3d841528f..f3d67ea20 100644 --- a/tools/vr/src/xr_frame.h +++ b/tools/vr/src/xr_frame.h @@ -7,6 +7,7 @@ #define DROIDDECK_XR_FRAME_SOCKET "droiddeck-xr-frames" #define DROIDDECK_XR_FRAME_MAX_BYTES (64u * 1024u * 1024u) #define DROIDDECK_XR_COLOR_LINEAR_RGBA8 1u +#define DROIDDECK_XR_COLOR_SRGB_RGBA8 2u struct DroidDeckXrFrameHeader { uint32_t magic, version, width, height; @@ -24,7 +25,8 @@ inline bool xr_frame_valid(const DroidDeckXrFrameHeader &header) { if (header.magic != DROIDDECK_XR_FRAME_MAGIC || header.version != DROIDDECK_XR_FRAME_VERSION || !header.frame_id || header.width < 2 || (header.width & 1u) || !header.height || header.width > 8192 || header.height > 4096 || bytes > DROIDDECK_XR_FRAME_MAX_BYTES - || header.bytes != bytes || header.color_space != DROIDDECK_XR_COLOR_LINEAR_RGBA8 || header.captured_ns <= 0) return false; + || header.bytes != bytes || (header.color_space != DROIDDECK_XR_COLOR_LINEAR_RGBA8 + && header.color_space != DROIDDECK_XR_COLOR_SRGB_RGBA8) || header.captured_ns <= 0) return false; for (int eye = 0; eye < 2; eye++) { for (const auto &row : header.eye_pose[eye]) for (float value : row) if (!std::isfinite(value)) return false; for (const auto &row : header.projection[eye]) for (float value : row) if (!std::isfinite(value)) return false; diff --git a/tools/vr/tests/test_xr_frames.cpp b/tools/vr/tests/test_xr_frames.cpp index 9a2acdd74..cc514eae7 100644 --- a/tools/vr/tests/test_xr_frames.cpp +++ b/tools/vr/tests/test_xr_frames.cpp @@ -41,6 +41,8 @@ int main(int argc, char **argv) { assert(mkdtemp(directory)); std::string socketPath = std::string(directory) + "/frames"; auto valid = Header(); assert(xr_frame_valid(valid)); + valid.color_space = DROIDDECK_XR_COLOR_SRGB_RGBA8; assert(xr_frame_valid(valid)); + auto unknownColor = valid; unknownColor.color_space = 3; assert(!xr_frame_valid(unknownColor)); auto invalid = valid; invalid.version++; assert(!xr_frame_valid(invalid)); invalid = valid; invalid.width = 3; assert(!xr_frame_valid(invalid)); invalid = valid; invalid.bytes--; assert(!xr_frame_valid(invalid)); @@ -82,6 +84,7 @@ int main(int argc, char **argv) { pixels.assign(valid.bytes, 99); DroidDeckXrPixels taken; assert(receiver.Take(&taken)); assert(taken.header.frame_id == 1 && taken.pixels[0] == 17 && taken.header.eye_pose[0][0][3] == -0.032f); + assert(taken.header.color_space == DROIDDECK_XR_COLOR_SRGB_RGBA8); assert(!receiver.Take(&taken)); for (uint64_t id = 2; id <= 100; id++) { auto header = Header(id); header.eye_pose[0][0][3] = static_cast(id);