From 7518f95b4a6b61bbccaed74a641d75f3afb152b6 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Sat, 19 Feb 2022 00:21:45 +0900 Subject: [PATCH] vrend: Compare gl_filter with GL_NEAREST Signed-off-by: Akihiko Odaki --- .../expectations/host/piglit-virgl-gl-fails.txt | 12 ------------ .../expectations/host/piglit-virgl-gles-fails.txt | 12 ------------ .../expectations/virt/piglit-virgl-gl-fails.txt | 12 ------------ .../expectations/virt/piglit-virgl-gles-fails.txt | 12 ------------ src/vrend_renderer.c | 2 +- 5 files changed, 1 insertion(+), 49 deletions(-) diff --git a/.gitlab-ci/expectations/host/piglit-virgl-gl-fails.txt b/.gitlab-ci/expectations/host/piglit-virgl-gl-fails.txt index 2444c3b..e9f7bae 100644 --- a/.gitlab-ci/expectations/host/piglit-virgl-gl-fails.txt +++ b/.gitlab-ci/expectations/host/piglit-virgl-gl-fails.txt @@ -103,24 +103,12 @@ spec@arb_copy_image@arb_copy_image-formats@Source: GL_RGBA32UI/Destination: GL_C spec@arb_depth_buffer_float@fbo-depthstencil-gl_depth32f_stencil8-copypixels,Fail spec@arb_depth_buffer_float@fbo-depthstencil-gl_depth32f_stencil8-drawpixels-24_8,Fail spec@arb_depth_buffer_float@fbo-depthstencil-gl_depth32f_stencil8-drawpixels-32f_24_8_rev,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32F,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32F NPOT,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor@GL_DEPTH32F_STENCIL8- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor@GL_DEPTH_COMPONENT32F- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled@GL_DEPTH32F_STENCIL8- swizzled- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled@GL_DEPTH_COMPONENT32F- swizzled- border color only,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT16,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT16 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT24,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT24 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT NPOT,Fail spec@arb_depth_texture@texwrap formats bordercolor,Fail spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT16- border color only,Fail spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT24- border color only,Fail diff --git a/.gitlab-ci/expectations/host/piglit-virgl-gles-fails.txt b/.gitlab-ci/expectations/host/piglit-virgl-gles-fails.txt index 9926ae6..53fa38a 100644 --- a/.gitlab-ci/expectations/host/piglit-virgl-gles-fails.txt +++ b/.gitlab-ci/expectations/host/piglit-virgl-gles-fails.txt @@ -155,24 +155,12 @@ spec@arb_copy_image@arb_copy_image-formats@Source: GL_RGBA8/Destination: GL_RGBA spec@arb_copy_image@arb_copy_image-formats@Source: GL_RGBA8I/Destination: GL_RGBA8_SNORM,Fail spec@arb_copy_image@arb_copy_image-formats@Source: GL_RGBA8_SNORM/Destination: GL_RGBA8_SNORM,Fail spec@arb_copy_image@arb_copy_image-formats@Source: GL_RGBA8UI/Destination: GL_RGBA8_SNORM,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32F,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32F NPOT,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor@GL_DEPTH32F_STENCIL8- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor@GL_DEPTH_COMPONENT32F- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled@GL_DEPTH32F_STENCIL8- swizzled- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled@GL_DEPTH_COMPONENT32F- swizzled- border color only,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT16,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT16 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT24,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT24 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT NPOT,Fail spec@arb_depth_texture@texwrap formats bordercolor,Fail spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT16- border color only,Fail spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT24- border color only,Fail diff --git a/.gitlab-ci/expectations/virt/piglit-virgl-gl-fails.txt b/.gitlab-ci/expectations/virt/piglit-virgl-gl-fails.txt index 9c5afd8..9f21407 100644 --- a/.gitlab-ci/expectations/virt/piglit-virgl-gl-fails.txt +++ b/.gitlab-ci/expectations/virt/piglit-virgl-gl-fails.txt @@ -103,24 +103,12 @@ spec@arb_copy_image@arb_copy_image-formats@Source: GL_RGBA32UI/Destination: GL_C spec@arb_depth_buffer_float@fbo-depthstencil-gl_depth32f_stencil8-copypixels,Fail spec@arb_depth_buffer_float@fbo-depthstencil-gl_depth32f_stencil8-drawpixels-24_8,Fail spec@arb_depth_buffer_float@fbo-depthstencil-gl_depth32f_stencil8-drawpixels-32f_24_8_rev,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32F,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32F NPOT,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor@GL_DEPTH32F_STENCIL8- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor@GL_DEPTH_COMPONENT32F- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled@GL_DEPTH32F_STENCIL8- swizzled- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled@GL_DEPTH_COMPONENT32F- swizzled- border color only,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT16,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT16 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT24,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT24 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT NPOT,Fail spec@arb_depth_texture@texwrap formats bordercolor,Fail spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT16- border color only,Fail spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT24- border color only,Fail diff --git a/.gitlab-ci/expectations/virt/piglit-virgl-gles-fails.txt b/.gitlab-ci/expectations/virt/piglit-virgl-gles-fails.txt index f2b6e4b..ec6b1e4 100644 --- a/.gitlab-ci/expectations/virt/piglit-virgl-gles-fails.txt +++ b/.gitlab-ci/expectations/virt/piglit-virgl-gles-fails.txt @@ -183,24 +183,12 @@ spec@arb_copy_image@arb_copy_image-formats@Source: GL_RGBA8/Destination: GL_RGBA spec@arb_copy_image@arb_copy_image-formats@Source: GL_RGBA8I/Destination: GL_RGBA8_SNORM,Fail spec@arb_copy_image@arb_copy_image-formats@Source: GL_RGBA8_SNORM/Destination: GL_RGBA8_SNORM,Fail spec@arb_copy_image@arb_copy_image-formats@Source: GL_RGBA8UI/Destination: GL_RGBA8_SNORM,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32F,Fail -spec@arb_depth_buffer_float@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32F NPOT,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor@GL_DEPTH32F_STENCIL8- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor@GL_DEPTH_COMPONENT32F- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled@GL_DEPTH32F_STENCIL8- swizzled- border color only,Fail spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled@GL_DEPTH_COMPONENT32F- swizzled- border color only,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT16,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT16 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT24,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT24 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT32 NPOT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT,Fail -spec@arb_depth_texture@fbo-generatemipmap-formats@GL_DEPTH_COMPONENT NPOT,Fail spec@arb_depth_texture@texwrap formats bordercolor,Fail spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT16- border color only,Fail spec@arb_depth_texture@texwrap formats bordercolor@GL_DEPTH_COMPONENT24- border color only,Fail diff --git a/src/vrend_renderer.c b/src/vrend_renderer.c index 39355de..5debfe5 100644 --- a/src/vrend_renderer.c +++ b/src/vrend_renderer.c @@ -9349,7 +9349,7 @@ static bool vrend_renderer_prepare_blit(struct vrend_context *ctx, } /* glBlitFramebuffer - can support depth stencil with NEAREST which we use for mipmaps */ - if ((info->b.mask & (PIPE_MASK_Z | PIPE_MASK_S)) && info->gl_filter == PIPE_TEX_FILTER_LINEAR) + if ((info->b.mask & (PIPE_MASK_Z | PIPE_MASK_S)) && info->gl_filter != GL_NEAREST) return false; /* since upstream mesa change