Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

rendervulkan: Hook up colorspace mask

Browse source
This commit is contained in:
Joshua Ashton 2022-12-15 09:00:26 +00:00 committed by Joshie
parent 49a6c0f451
commit c2665304c3
3 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rendervulkan.cpp
View file

@ -3352,7 +3352,7 @@ bool vulkan_composite( const struct FrameInfo_t *frameInfo, std::shared_ptr<CVul
}
else
{
cmdBuffer->bindPipeline( g_device.pipeline(SHADER_TYPE_BLIT, frameInfo->layerCount, frameInfo->ycbcrMask()));
cmdBuffer->bindPipeline( g_device.pipeline(SHADER_TYPE_BLIT, frameInfo->layerCount, frameInfo->ycbcrMask(), 0u, frameInfo->colorspaceMask()));
bind_all_layers(cmdBuffer.get(), frameInfo);
cmdBuffer->bindTarget(compositeImage);
cmdBuffer->pushConstants<BlitPushData_t>(frameInfo);

11
src/rendervulkan.hpp
View file

@ -79,6 +79,7 @@ enum GamescopeAppTextureColorspace {
GAMESCOPE_APP_TEXTURE_COLORSPACE_SCRGB,
GAMESCOPE_APP_TEXTURE_COLORSPACE_HDR10_PQ,
};
const uint32_t GamescopeAppTextureColorspace_Bits = 2;
inline GamescopeAppTextureColorspace VkColorSpaceToGamescopeAppTextureColorSpace(VkColorSpaceKHR colorspace)
{
@ -229,6 +230,8 @@ struct FrameInfo_t
bool blackBorder;
bool linearFilter;
GamescopeAppTextureColorspace colorspace;
bool isYcbcr() const
{
if ( !tex )
@ -265,6 +268,14 @@ struct FrameInfo_t
}
return result;
}
uint32_t colorspaceMask() const {
uint32_t result = 0;
for (int i = 0; i < layerCount; i++)
{
result |= layers[ i ].colorspace << i * GamescopeAppTextureColorspace_Bits;
}
return result;
}
};
extern bool g_bIsCompositeDebug;

12
src/steamcompmgr.cpp
View file

@ -173,6 +173,14 @@ struct commit_t
wlserver_unlock();
}
GamescopeAppTextureColorspace colorspace() const
{
if (feedback)
return VkColorSpaceToGamescopeAppTextureColorSpace(feedback->vk_colorspace);
return GAMESCOPE_APP_TEXTURE_COLORSPACE_SRGB;
}
struct wlr_buffer *buf = nullptr;
uint32_t fb_id = 0;
std::shared_ptr<CVulkanTexture> vulkanTex;
@ -1400,6 +1408,7 @@ void MouseCursor::paint(win *window, win *fit, struct FrameInfo_t *frameInfo)
layer->linearFilter = false;
layer->blackBorder = false;
layer->colorspace = GAMESCOPE_APP_TEXTURE_COLORSPACE_SRGB;
}
void MouseCursor::updateCursorFeedback( bool bForce )
@ -1443,6 +1452,7 @@ paint_cached_base_layer(const std::shared_ptr<commit_t>& commit, const BaseLayer
layer->offset.y = base.offset[1];
layer->opacity = base.opacity * flOpacityScale;
layer->colorspace = commit->colorspace();
layer->tex = commit->vulkanTex;
layer->fbid = commit->fb_id;
@ -1616,6 +1626,7 @@ paint_window(win *w, win *scaleW, struct FrameInfo_t *frameInfo,
layer->fbid = lastCommit->fb_id;
layer->linearFilter = (w->isOverlay || w->isExternalOverlay) ? true : g_upscaleFilter != GamescopeUpscaleFilter::NEAREST;
layer->colorspace = lastCommit->colorspace();
if ( flags & PaintWindowFlag::BasePlane )
{
@ -1964,6 +1975,7 @@ paint_all(bool async)
layer->fbid = layer->tex->fbid();
layer->linearFilter = false;
layer->colorspace = GAMESCOPE_APP_TEXTURE_COLORSPACE_SRGB;
int ret = drm_prepare( &g_DRM, async, &frameInfo );