third_party
/
virglrenderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shader: Improve handling of front/back color

Browse Source 
Get rid of the ex_ prefix and use the common per stage prefix
plus the _c or _bc suffix. With that we can also cover the
compatibility contexts.

v2: remove ducplicate assignments (John)

Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/742>
macos/master
Gert Wollny 3 years ago committed by Marge Bot
parent 430efa9fa9
commit 27da7dca98
5 changed files with 19 additions and 357 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 92
      .gitlab-ci/expectations/host/piglit-virgl-gl-fails.txt
  2. 77
      .gitlab-ci/expectations/host/piglit-virgl-gles-fails.txt
  3. 90
      .gitlab-ci/expectations/virt/piglit-virgl-gl-fails.txt
  4. 78
      .gitlab-ci/expectations/virt/piglit-virgl-gles-fails.txt
  5. 19
      src/vrend_shader.c

92
.gitlab-ci/expectations/host/piglit-virgl-gl-fails.txt
Unescape View File

@ -460,76 +460,12 @@ spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SR
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA- swizzled- border color only,Fail
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_S3TC_DXT1_EXT- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_S3TC_DXT1_EXT- swizzled- border color only,Fail
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB- swizzled- border color only,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-07,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-07,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-08,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-08,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-07,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-07,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-08,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-08,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-clamp-z,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-clamp-z,Fail
spec@glsl-1.20@execution@matrix-out-of-bounds-access@fs-mat4-out-of-bounds-6,Crash spec@glsl-1.20@execution@matrix-out-of-bounds-access@fs-mat4-out-of-bounds-6,Crash
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.50@execution@primitive-id-no-gs-quads,Fail spec@glsl-1.50@execution@primitive-id-no-gs-quads,Fail
spec@glsl-1.50@execution@primitive-id-no-gs-quad-strip,Fail spec@glsl-1.50@execution@primitive-id-no-gs-quad-strip,Fail
spec@khr_texture_compression_astc@array-gl@12x12 Block Dim,Fail spec@khr_texture_compression_astc@array-gl@12x12 Block Dim,Fail
@ -699,44 +635,16 @@ spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA16- swizzled- borde
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA2- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA2- swizzled- border color only,Fail
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border color only,Fail
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail
spec@!opengl 1.1@two-sided-lighting,Fail
spec@!opengl 1.1@windowoverlap,Fail spec@!opengl 1.1@windowoverlap,Fail
spec@!opengl 1.2@copyteximage 3d,Fail spec@!opengl 1.2@copyteximage 3d,Fail
spec@!opengl 1.2@texwrap 3d bordercolor,Fail spec@!opengl 1.2@texwrap 3d bordercolor,Fail
spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail
spec@!opengl 1.2@texwrap 3d proj bordercolor,Fail spec@!opengl 1.2@texwrap 3d proj bordercolor,Fail
spec@!opengl 1.2@texwrap 3d proj bordercolor@GL_RGBA8- projected- border color only,Fail spec@!opengl 1.2@texwrap 3d proj bordercolor@GL_RGBA8- projected- border color only,Fail
spec@!opengl 1.2@two-sided-lighting-separate-specular,Fail
spec@!opengl 1.5@depth-tex-compare,Fail spec@!opengl 1.5@depth-tex-compare,Fail
spec@!opengl 1.5@draw-elements-user,Fail spec@!opengl 1.5@draw-elements-user,Fail
spec@!opengl 2.0@gl-2.0-edgeflag,Fail spec@!opengl 2.0@gl-2.0-edgeflag,Fail
spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front front2@vs- gs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side front2 back2@gs-out and fs,Fail
spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-first,Fail
spec@!opengl 3.2@gl-3.2-adj-prims cull-front pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims cull-front pv-first,Fail
spec@!opengl 3.2@gl-3.2-adj-prims line cull-back pv-first,Fail spec@!opengl 3.2@gl-3.2-adj-prims line cull-back pv-first,Fail

77
.gitlab-ci/expectations/host/piglit-virgl-gles-fails.txt
Unescape View File

@ -783,21 +783,8 @@ spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SR
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA- swizzled- border color only,Fail
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_S3TC_DXT1_EXT- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_S3TC_DXT1_EXT- swizzled- border color only,Fail
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB- swizzled- border color only,Fail
spec@ext_transform_feedback@builtin-varyings gl_color,Fail
spec@ext_transform_feedback@immediate-reuse-index-buffer,Fail spec@ext_transform_feedback@immediate-reuse-index-buffer,Fail
spec@ext_transform_feedback@immediate-reuse-uniform-buffer,Fail spec@ext_transform_feedback@immediate-reuse-uniform-buffer,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-07,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-07,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-08,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-08,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-07,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-07,Fail
@ -818,27 +805,7 @@ spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d_projvec4,Fail
spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2dshadow,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2dshadow,Fail
spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 3d,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 3d,Fail
spec@glsl-1.30@execution@fs-texturelod-miplevels-biased,Fail spec@glsl-1.30@execution@fs-texturelod-miplevels-biased,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-mixed,Fail spec@glsl-1.30@execution@interpolation@interpolation-mixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-distance,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-fixed,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-none,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-none,Fail
@ -879,22 +846,6 @@ spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-fixed,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-none,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-vertex,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darray,Fail spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darray,Fail
spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darrayshadow,Fail spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darrayshadow,Fail
spec@glsl-1.30@execution@tex-miplevel-selection texture() 1d,Fail spec@glsl-1.30@execution@tex-miplevel-selection texture() 1d,Fail
@ -3378,14 +3329,12 @@ spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA16- swizzled- borde
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA2- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA2- swizzled- border color only,Fail
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border color only,Fail
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail
spec@!opengl 1.1@two-sided-lighting,Fail
spec@!opengl 1.1@windowoverlap,ExpectedFail spec@!opengl 1.1@windowoverlap,ExpectedFail
spec@!opengl 1.2@copyteximage 3d,Fail spec@!opengl 1.2@copyteximage 3d,Fail
spec@!opengl 1.2@texwrap 3d bordercolor,Fail spec@!opengl 1.2@texwrap 3d bordercolor,Fail
spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail
spec@!opengl 1.2@texwrap 3d proj bordercolor,Fail spec@!opengl 1.2@texwrap 3d proj bordercolor,Fail
spec@!opengl 1.2@texwrap 3d proj bordercolor@GL_RGBA8- projected- border color only,Fail spec@!opengl 1.2@texwrap 3d proj bordercolor@GL_RGBA8- projected- border color only,Fail
spec@!opengl 1.2@two-sided-lighting-separate-specular,Fail
spec@!opengl 1.4@gl-1.4-tex1d-2dborder,Fail spec@!opengl 1.4@gl-1.4-tex1d-2dborder,Fail
spec@!opengl 1.4@tex-miplevel-selection-lod-bias,Fail spec@!opengl 1.4@tex-miplevel-selection-lod-bias,Fail
spec@!opengl 1.5@depth-tex-compare,Fail spec@!opengl 1.5@depth-tex-compare,Fail
@ -3397,32 +3346,6 @@ spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail
spec@!opengl 2.0@gl-2.0-large-point-fs,Fail spec@!opengl 2.0@gl-2.0-large-point-fs,Fail
spec@!opengl 2.0@gl-2.0-vertexattribpointer,Crash spec@!opengl 2.0@gl-2.0-vertexattribpointer,Crash
spec@!opengl 2.0@occlusion-query-discard,Fail spec@!opengl 2.0@occlusion-query-discard,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front front2@vs- gs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side front2 back2@gs-out and fs,Fail
spec@!opengl 3.0@required-texture-attachment-formats,Fail spec@!opengl 3.0@required-texture-attachment-formats,Fail
spec@!opengl 3.0@sampler-cube-shadow,Fail spec@!opengl 3.0@sampler-cube-shadow,Fail
spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-first,ExpectedFail spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-first,ExpectedFail

90
.gitlab-ci/expectations/virt/piglit-virgl-gl-fails.txt
Unescape View File

@ -479,76 +479,12 @@ spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SR
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_ALPHA- swizzled- border color only,Fail
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_S3TC_DXT1_EXT- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB_S3TC_DXT1_EXT- swizzled- border color only,Fail
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB- swizzled- border color only,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-07,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-07,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-08,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-08,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-07,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-07,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-08,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-08,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-clamp-z,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-clamp-z,Fail
spec@glsl-1.20@execution@matrix-out-of-bounds-access@fs-mat4-out-of-bounds-6,Crash spec@glsl-1.20@execution@matrix-out-of-bounds-access@fs-mat4-out-of-bounds-6,Crash
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.50@execution@primitive-id-no-gs-quads,Fail spec@glsl-1.50@execution@primitive-id-no-gs-quads,Fail
spec@glsl-1.50@execution@primitive-id-no-gs-quad-strip,Fail spec@glsl-1.50@execution@primitive-id-no-gs-quad-strip,Fail
spec@khr_texture_compression_astc@array-gl@12x12 Block Dim,Fail spec@khr_texture_compression_astc@array-gl@12x12 Block Dim,Fail
@ -720,42 +656,16 @@ spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA16- swizzled- borde
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA2- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA2- swizzled- border color only,Fail
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border color only,Fail
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail
spec@!opengl 1.1@two-sided-lighting,Fail
spec@!opengl 1.1@windowoverlap,Fail spec@!opengl 1.1@windowoverlap,Fail
spec@!opengl 1.2@copyteximage 3d,Fail spec@!opengl 1.2@copyteximage 3d,Fail
spec@!opengl 1.2@texwrap 3d bordercolor,Fail spec@!opengl 1.2@texwrap 3d bordercolor,Fail
spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail
spec@!opengl 1.2@texwrap 3d proj bordercolor,Fail spec@!opengl 1.2@texwrap 3d proj bordercolor,Fail
spec@!opengl 1.2@texwrap 3d proj bordercolor@GL_RGBA8- projected- border color only,Fail spec@!opengl 1.2@texwrap 3d proj bordercolor@GL_RGBA8- projected- border color only,Fail
spec@!opengl 1.2@two-sided-lighting-separate-specular,Fail
spec@!opengl 1.5@depth-tex-compare,Fail spec@!opengl 1.5@depth-tex-compare,Fail
spec@!opengl 1.5@draw-elements-user,Fail spec@!opengl 1.5@draw-elements-user,Fail
spec@!opengl 2.0@gl-2.0-edgeflag,Fail spec@!opengl 2.0@gl-2.0-edgeflag,Fail
spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side front back back2@gs-out and fs,Fail spec@!opengl 2.0@vertex-program-two-side front back back2@gs-out and fs,Fail
spec@!opengl 2.0@vertex-program-two-side front back front2@gs-out and fs,Fail spec@!opengl 2.0@vertex-program-two-side front back front2@gs-out and fs,Fail
spec@!opengl 2.0@vertex-program-two-side front back@gs-out and fs,Fail spec@!opengl 2.0@vertex-program-two-side front back@gs-out and fs,Fail

78
.gitlab-ci/expectations/virt/piglit-virgl-gles-fails.txt
Unescape View File

@ -834,18 +834,6 @@ spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SR
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB- swizzled- border color only,Fail spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled@GL_COMPRESSED_SRGB- swizzled- border color only,Fail
spec@ext_transform_feedback@immediate-reuse-index-buffer,Fail spec@ext_transform_feedback@immediate-reuse-index-buffer,Fail
spec@ext_transform_feedback@immediate-reuse-uniform-buffer,Fail spec@ext_transform_feedback@immediate-reuse-uniform-buffer,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-flat-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.10@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-07,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-07,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-08,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow1d-08,Fail
spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-07,Fail spec@glsl-1.10@execution@samplers@glsl-fs-shadow2d-07,Fail
@ -866,27 +854,7 @@ spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d_projvec4,Fail
spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2dshadow,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2dshadow,Fail
spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 3d,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 3d,Fail
spec@glsl-1.30@execution@fs-texturelod-miplevels-biased,Fail spec@glsl-1.30@execution@fs-texturelod-miplevels-biased,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-flat-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-mixed,Fail spec@glsl-1.30@execution@interpolation@interpolation-mixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-none-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-distance,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-fixed,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-none,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_backcolor-flat-none,Fail
@ -927,22 +895,6 @@ spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-fixed,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-none,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-vertex,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backcolor-smooth-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-flat-vertex,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-distance,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-fixed,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-none,Fail
spec@glsl-1.30@execution@interpolation@interpolation-smooth-gl_backsecondarycolor-smooth-vertex,Fail
spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darray,Fail spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darray,Fail
spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darrayshadow,Fail spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darrayshadow,Fail
spec@glsl-1.30@execution@tex-miplevel-selection texture() 1d,Fail spec@glsl-1.30@execution@tex-miplevel-selection texture() 1d,Fail
@ -3455,14 +3407,12 @@ spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA16- swizzled- borde
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA2- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA2- swizzled- border color only,Fail
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border color only,Fail
spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail
spec@!opengl 1.1@two-sided-lighting,Fail
spec@!opengl 1.1@windowoverlap,ExpectedFail spec@!opengl 1.1@windowoverlap,ExpectedFail
spec@!opengl 1.2@copyteximage 3d,Fail spec@!opengl 1.2@copyteximage 3d,Fail
spec@!opengl 1.2@texwrap 3d bordercolor,Fail spec@!opengl 1.2@texwrap 3d bordercolor,Fail
spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail
spec@!opengl 1.2@texwrap 3d proj bordercolor,Fail spec@!opengl 1.2@texwrap 3d proj bordercolor,Fail
spec@!opengl 1.2@texwrap 3d proj bordercolor@GL_RGBA8- projected- border color only,Fail spec@!opengl 1.2@texwrap 3d proj bordercolor@GL_RGBA8- projected- border color only,Fail
spec@!opengl 1.2@two-sided-lighting-separate-specular,Fail
spec@!opengl 1.4@gl-1.4-tex1d-2dborder,Fail spec@!opengl 1.4@gl-1.4-tex1d-2dborder,Fail
spec@!opengl 1.4@tex-miplevel-selection-lod-bias,Fail spec@!opengl 1.4@tex-miplevel-selection-lod-bias,Fail
spec@!opengl 1.5@depth-tex-compare,Fail spec@!opengl 1.5@depth-tex-compare,Fail
@ -3473,34 +3423,6 @@ spec@!opengl 2.0@gl-2.0-edgeflag,Fail
spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail
spec@!opengl 2.0@gl-2.0-large-point-fs,Fail spec@!opengl 2.0@gl-2.0-large-point-fs,Fail
spec@!opengl 2.0@occlusion-query-discard,Fail spec@!opengl 2.0@occlusion-query-discard,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back front2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled back@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back front2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front back@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front front2 back2,Fail
spec@!opengl 2.0@vertex-program-two-side enabled front front2 back2@vs and fs,Fail
spec@!opengl 2.0@vertex-program-two-side front back back2@gs-out and fs,Fail
spec@!opengl 2.0@vertex-program-two-side front back front2@gs-out and fs,Fail
spec@!opengl 2.0@vertex-program-two-side front back@gs-out and fs,Fail
spec@!opengl 2.0@vertex-program-two-side front front2 back2@gs-out and fs,Fail
spec@!opengl 3.0@required-texture-attachment-formats,Fail spec@!opengl 3.0@required-texture-attachment-formats,Fail
spec@!opengl 3.0@sampler-cube-shadow,Fail spec@!opengl 3.0@sampler-cube-shadow,Fail
spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-first,ExpectedFail spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-first,ExpectedFail

19
src/vrend_shader.c
Unescape View File

@ -1105,7 +1105,6 @@ iter_declaration(struct tgsi_iterate_context *iter,
} }
add_two_side = true; add_two_side = true;
} }
name_prefix = "ex";
} }
} }
break; break;
@ -1405,14 +1404,12 @@ iter_declaration(struct tgsi_iterate_context *iter,
else if (ctx->outputs[i].sid == 1) else if (ctx->outputs[i].sid == 1)
name_prefix = "gl_FrontSecondaryColor"; name_prefix = "gl_FrontSecondaryColor";
} else { } else {
name_prefix = ctx->is_last_vertex_stage ? "ex" : get_stage_output_name_prefix(iter->processor.Processor);
ctx->color_out_mask |= (1 << decl->Semantic.Index); ctx->color_out_mask |= (1 << decl->Semantic.Index);
} }
} }
ctx->outputs[i].override_no_wm = false; ctx->outputs[i].override_no_wm = false;
break; break;
case TGSI_SEMANTIC_BCOLOR: case TGSI_SEMANTIC_BCOLOR:
if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX) {
if (ctx->glsl_ver_required < 140) { if (ctx->glsl_ver_required < 140) {
ctx->outputs[i].glsl_no_index = true; ctx->outputs[i].glsl_no_index = true;
if (ctx->outputs[i].sid == 0) if (ctx->outputs[i].sid == 0)
@ -1423,7 +1420,6 @@ iter_declaration(struct tgsi_iterate_context *iter,
ctx->outputs[i].override_no_wm = false; ctx->outputs[i].override_no_wm = false;
ctx->color_out_mask |= (1 << decl->Semantic.Index) << 2; ctx->color_out_mask |= (1 << decl->Semantic.Index) << 2;
} }
}
break; break;
case TGSI_SEMANTIC_PSIZE: case TGSI_SEMANTIC_PSIZE:
if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX || if (iter->processor.Processor == TGSI_PROCESSOR_VERTEX ||
@ -1865,11 +1861,14 @@ static void emit_color_select(const struct dump_ctx *ctx,
if (!ctx->key->color_two_side || !(ctx->color_in_mask & 0x3)) if (!ctx->key->color_two_side || !(ctx->color_in_mask & 0x3))
return; return;
const char *name_prefix = get_stage_input_name_prefix(ctx, ctx->prog_type);
if (ctx->color_in_mask & 1) if (ctx->color_in_mask & 1)
emit_buf(glsl_strbufs, "realcolor0 = gl_FrontFacing ? ex_c0 : ex_bc0;\n"); emit_buff(glsl_strbufs, "realcolor0 = gl_FrontFacing ? %s_c0 : %s_bc0;\n",
name_prefix, name_prefix);
if (ctx->color_in_mask & 2) if (ctx->color_in_mask & 2)
emit_buf(glsl_strbufs, "realcolor1 = gl_FrontFacing ? ex_c1 : ex_bc1;\n"); emit_buff(glsl_strbufs, "realcolor1 = gl_FrontFacing ? %s_c1 : %s_bc1;\n",
name_prefix, name_prefix);
} }
static void emit_prescale(struct vrend_glsl_strbufs *glsl_strbufs) static void emit_prescale(struct vrend_glsl_strbufs *glsl_strbufs)
@ -6518,11 +6517,11 @@ static void emit_ios_vs(const struct dump_ctx *ctx,
bcolor_emitted = front_back_color_emitted_flags[ctx->outputs[i].sid] & BACK_COLOR_EMITTED; bcolor_emitted = front_back_color_emitted_flags[ctx->outputs[i].sid] & BACK_COLOR_EMITTED;
if (fcolor_emitted && !bcolor_emitted) { if (fcolor_emitted && !bcolor_emitted) {
emit_hdrf(glsl_strbufs, "%sout vec4 ex_bc%d;\n", INTERP_PREFIX, ctx->outputs[i].sid); emit_hdrf(glsl_strbufs, "%sout vec4 vso_bc%d;\n", INTERP_PREFIX, ctx->outputs[i].sid);
front_back_color_emitted_flags[ctx->outputs[i].sid] |= BACK_COLOR_EMITTED; front_back_color_emitted_flags[ctx->outputs[i].sid] |= BACK_COLOR_EMITTED;
} }
if (bcolor_emitted && !fcolor_emitted) { if (bcolor_emitted && !fcolor_emitted) {
emit_hdrf(glsl_strbufs, "%sout vec4 ex_c%d;\n", INTERP_PREFIX, ctx->outputs[i].sid); emit_hdrf(glsl_strbufs, "%sout vec4 vso_c%d;\n", INTERP_PREFIX, ctx->outputs[i].sid);
front_back_color_emitted_flags[ctx->outputs[i].sid] |= FRONT_COLOR_EMITTED; front_back_color_emitted_flags[ctx->outputs[i].sid] |= FRONT_COLOR_EMITTED;
} }
} }
@ -7506,9 +7505,9 @@ static bool vrend_patch_vertex_shader_interpolants(
replace_interp(prog_strings, "gl_BackColor", pstring, auxstring); replace_interp(prog_strings, "gl_BackColor", pstring, auxstring);
} }
} else { } else {
snprintf(glsl_name, 64, "ex_c%d", fs_info->interpinfo[i].semantic_index); snprintf(glsl_name, 64, "%s_c%d", oprefix, fs_info->interpinfo[i].semantic_index);
replace_interp(prog_strings, glsl_name, pstring, auxstring); replace_interp(prog_strings, glsl_name, pstring, auxstring);
snprintf(glsl_name, 64, "ex_bc%d", fs_info->interpinfo[i].semantic_index); snprintf(glsl_name, 64, "%s_bc%d", oprefix, fs_info->interpinfo[i].semantic_index);
replace_interp(prog_strings, glsl_name, pstring, auxstring); replace_interp(prog_strings, glsl_name, pstring, auxstring);
} }
break; break;

Write Preview
Loading…
Cancel
Save