From c5d199fa2ca612acd22f7ff2fc584b9110bbbd44 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 21 Nov 2017 07:31:57 -0700 Subject: [PATCH] svga: move svga_is_format_supported() to svga_format.c where the other format-related functions live. Reviewed-by: Charmaine Lee --- src/gallium/drivers/svga/svga_format.c | 119 ++++++++++++++++++++++++ src/gallium/drivers/svga/svga_format.h | 10 ++ src/gallium/drivers/svga/svga_screen.c | 121 ------------------------- 3 files changed, 129 insertions(+), 121 deletions(-) diff --git a/src/gallium/drivers/svga/svga_format.c b/src/gallium/drivers/svga/svga_format.c index f5265a10945..964923f084e 100644 --- a/src/gallium/drivers/svga/svga_format.c +++ b/src/gallium/drivers/svga/svga_format.c @@ -2070,3 +2070,122 @@ svga_linear_to_srgb(SVGA3dSurfaceFormat format) return format; } } + + +/** + * Implement pipe_screen::is_format_supported(). + * \param bindings bitmask of PIPE_BIND_x flags + */ +boolean +svga_is_format_supported(struct pipe_screen *screen, + enum pipe_format format, + enum pipe_texture_target target, + unsigned sample_count, + unsigned bindings) +{ + struct svga_screen *ss = svga_screen(screen); + SVGA3dSurfaceFormat svga_format; + SVGA3dSurfaceFormatCaps caps; + SVGA3dSurfaceFormatCaps mask; + + assert(bindings); + + if (sample_count > 1) { + /* In ms_samples, if bit N is set it means that we support + * multisample with N+1 samples per pixel. + */ + if ((ss->ms_samples & (1 << (sample_count - 1))) == 0) { + return FALSE; + } + } + + svga_format = svga_translate_format(ss, format, bindings); + if (svga_format == SVGA3D_FORMAT_INVALID) { + return FALSE; + } + + if (!ss->sws->have_vgpu10 && + util_format_is_srgb(format) && + (bindings & PIPE_BIND_DISPLAY_TARGET)) { + /* We only support sRGB rendering with vgpu10 */ + return FALSE; + } + + /* + * For VGPU10 vertex formats, skip querying host capabilities + */ + + if (ss->sws->have_vgpu10 && (bindings & PIPE_BIND_VERTEX_BUFFER)) { + SVGA3dSurfaceFormat svga_format; + unsigned flags; + svga_translate_vertex_format_vgpu10(format, &svga_format, &flags); + return svga_format != SVGA3D_FORMAT_INVALID; + } + + /* + * Override host capabilities, so that we end up with the same + * visuals for all virtual hardware implementations. + */ + if (bindings & PIPE_BIND_DISPLAY_TARGET) { + switch (svga_format) { + case SVGA3D_A8R8G8B8: + case SVGA3D_X8R8G8B8: + case SVGA3D_R5G6B5: + break; + + /* VGPU10 formats */ + case SVGA3D_B8G8R8A8_UNORM: + case SVGA3D_B8G8R8X8_UNORM: + case SVGA3D_B5G6R5_UNORM: + case SVGA3D_B8G8R8X8_UNORM_SRGB: + case SVGA3D_B8G8R8A8_UNORM_SRGB: + case SVGA3D_R8G8B8A8_UNORM_SRGB: + break; + + /* Often unsupported/problematic. This means we end up with the same + * visuals for all virtual hardware implementations. + */ + case SVGA3D_A4R4G4B4: + case SVGA3D_A1R5G5B5: + return FALSE; + + default: + return FALSE; + } + } + + /* + * Query the host capabilities. + */ + svga_get_format_cap(ss, svga_format, &caps); + + if (bindings & PIPE_BIND_RENDER_TARGET) { + /* Check that the color surface is blendable, unless it's an + * integer format. + */ + if (!svga_format_is_integer(svga_format) && + (caps.value & SVGA3DFORMAT_OP_NOALPHABLEND)) { + return FALSE; + } + } + + mask.value = 0; + if (bindings & PIPE_BIND_RENDER_TARGET) { + mask.value |= SVGA3DFORMAT_OP_OFFSCREEN_RENDERTARGET; + } + if (bindings & PIPE_BIND_DEPTH_STENCIL) { + mask.value |= SVGA3DFORMAT_OP_ZSTENCIL; + } + if (bindings & PIPE_BIND_SAMPLER_VIEW) { + mask.value |= SVGA3DFORMAT_OP_TEXTURE; + } + + if (target == PIPE_TEXTURE_CUBE) { + mask.value |= SVGA3DFORMAT_OP_CUBETEXTURE; + } + else if (target == PIPE_TEXTURE_3D) { + mask.value |= SVGA3DFORMAT_OP_VOLUMETEXTURE; + } + + return (caps.value & mask.value) == mask.value; +} diff --git a/src/gallium/drivers/svga/svga_format.h b/src/gallium/drivers/svga/svga_format.h index 55d89ed2b48..c063589cafe 100644 --- a/src/gallium/drivers/svga/svga_format.h +++ b/src/gallium/drivers/svga/svga_format.h @@ -120,4 +120,14 @@ svga_format_is_shareable(const struct svga_screen *ss, SVGA3dSurfaceFormat svga_linear_to_srgb(SVGA3dSurfaceFormat format); + + +boolean +svga_is_format_supported(struct pipe_screen *screen, + enum pipe_format format, + enum pipe_texture_target target, + unsigned sample_count, + unsigned bindings); + + #endif /* SVGA_FORMAT_H_ */ diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index 86f53b21365..2f68466c13f 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -739,127 +739,6 @@ svga_get_shader_param(struct pipe_screen *screen, enum pipe_shader_type shader, } -/** - * Implement pipe_screen::is_format_supported(). - * \param bindings bitmask of PIPE_BIND_x flags - */ -static boolean -svga_is_format_supported( struct pipe_screen *screen, - enum pipe_format format, - enum pipe_texture_target target, - unsigned sample_count, - unsigned bindings) -{ - struct svga_screen *ss = svga_screen(screen); - SVGA3dSurfaceFormat svga_format; - SVGA3dSurfaceFormatCaps caps; - SVGA3dSurfaceFormatCaps mask; - - assert(bindings); - - if (sample_count > 1) { - /* In ms_samples, if bit N is set it means that we support - * multisample with N+1 samples per pixel. - */ - if ((ss->ms_samples & (1 << (sample_count - 1))) == 0) { - return FALSE; - } - } - - svga_format = svga_translate_format(ss, format, bindings); - if (svga_format == SVGA3D_FORMAT_INVALID) { - return FALSE; - } - - if (!ss->sws->have_vgpu10 && - util_format_is_srgb(format) && - (bindings & PIPE_BIND_DISPLAY_TARGET)) { - /* We only support sRGB rendering with vgpu10 */ - return FALSE; - } - - /* - * For VGPU10 vertex formats, skip querying host capabilities - */ - - if (ss->sws->have_vgpu10 && (bindings & PIPE_BIND_VERTEX_BUFFER)) { - SVGA3dSurfaceFormat svga_format; - unsigned flags; - svga_translate_vertex_format_vgpu10(format, &svga_format, &flags); - return svga_format != SVGA3D_FORMAT_INVALID; - } - - /* - * Override host capabilities, so that we end up with the same - * visuals for all virtual hardware implementations. - */ - - if (bindings & PIPE_BIND_DISPLAY_TARGET) { - switch (svga_format) { - case SVGA3D_A8R8G8B8: - case SVGA3D_X8R8G8B8: - case SVGA3D_R5G6B5: - break; - - /* VGPU10 formats */ - case SVGA3D_B8G8R8A8_UNORM: - case SVGA3D_B8G8R8X8_UNORM: - case SVGA3D_B5G6R5_UNORM: - case SVGA3D_B8G8R8X8_UNORM_SRGB: - case SVGA3D_B8G8R8A8_UNORM_SRGB: - case SVGA3D_R8G8B8A8_UNORM_SRGB: - break; - - /* Often unsupported/problematic. This means we end up with the same - * visuals for all virtual hardware implementations. - */ - case SVGA3D_A4R4G4B4: - case SVGA3D_A1R5G5B5: - return FALSE; - - default: - return FALSE; - } - } - - /* - * Query the host capabilities. - */ - - svga_get_format_cap(ss, svga_format, &caps); - - if (bindings & PIPE_BIND_RENDER_TARGET) { - /* Check that the color surface is blendable, unless it's an - * integer format. - */ - if (!svga_format_is_integer(svga_format) && - (caps.value & SVGA3DFORMAT_OP_NOALPHABLEND)) { - return FALSE; - } - } - - mask.value = 0; - if (bindings & PIPE_BIND_RENDER_TARGET) { - mask.value |= SVGA3DFORMAT_OP_OFFSCREEN_RENDERTARGET; - } - if (bindings & PIPE_BIND_DEPTH_STENCIL) { - mask.value |= SVGA3DFORMAT_OP_ZSTENCIL; - } - if (bindings & PIPE_BIND_SAMPLER_VIEW) { - mask.value |= SVGA3DFORMAT_OP_TEXTURE; - } - - if (target == PIPE_TEXTURE_CUBE) { - mask.value |= SVGA3DFORMAT_OP_CUBETEXTURE; - } - else if (target == PIPE_TEXTURE_3D) { - mask.value |= SVGA3DFORMAT_OP_VOLUMETEXTURE; - } - - return (caps.value & mask.value) == mask.value; -} - - static void svga_fence_reference(struct pipe_screen *screen, struct pipe_fence_handle **ptr, -- 2.30.2