KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i915g: Make sure we don't try to texture from the const file. 

It's an invalid value for the texture coordinate source, and this becomes
more common if we enable nir-to-tgsi.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11227>
This commit is contained in:
Emma Anholt 2021-06-07 11:51:21 -07:00 committed by Marge Bot
parent 1945c1f526
commit 4b9e52e818
4 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/drivers/i915/ci/deqp-i915-g33-fails.txt
View File

@ -1110,7 +1110,6 @@ dEQP-GLES2.functional.shaders.operator.common_functions.sign.mediump_float_fragm
dEQP-GLES2.functional.shaders.operator.common_functions.sign.mediump_vec3_fragment,Fail
dEQP-GLES2.functional.shaders.operator.geometric.normalize.highp_float_fragment,Fail
dEQP-GLES2.functional.shaders.operator.geometric.normalize.mediump_float_fragment,Fail
dEQP-GLES2.functional.shaders.random.all_features.fragment.1,Fail
dEQP-GLES2.functional.shaders.random.all_features.fragment.22,Fail
dEQP-GLES2.functional.shaders.random.all_features.fragment.28,Fail
dEQP-GLES2.functional.shaders.random.all_features.fragment.32,Fail
@ -1130,10 +1129,6 @@ dEQP-GLES2.functional.shaders.random.all_features.fragment.89,Fail
dEQP-GLES2.functional.shaders.random.all_features.fragment.93,Fail
dEQP-GLES2.functional.shaders.random.all_features.fragment.95,Fail
dEQP-GLES2.functional.shaders.random.all_features.fragment.97,Fail
dEQP-GLES2.functional.shaders.random.texture.fragment.26,Fail
dEQP-GLES2.functional.shaders.random.texture.fragment.40,Fail
dEQP-GLES2.functional.shaders.random.texture.fragment.42,Fail
dEQP-GLES2.functional.shaders.random.texture.fragment.59,Fail
dEQP-GLES2.functional.shaders.random.texture.vertex.10,Fail
dEQP-GLES2.functional.shaders.random.texture.vertex.16,Fail
dEQP-GLES2.functional.shaders.random.texture.vertex.2,Fail
@ -1414,7 +1409,6 @@ dEQP-GLES2.functional.uniform_api.value.initial.render.struct_in_array.float_vec
dEQP-GLES2.functional.uniform_api.value.initial.render.struct_in_array.mat4_mat2_both,Fail
dEQP-GLES2.functional.uniform_api.value.initial.render.struct_in_array.mat4_mat2_fragment,Fail
dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_nearest_nearest_mirror,Fail
dEQP-GLES2.functional.shaders.random.texture.fragment.101,Fail
KHR-GLES2.core.internalformat.copy_tex_image.alpha8_oes,Fail
KHR-GLES2.core.internalformat.copy_tex_image.luminance4_alpha4_oes,Fail
KHR-GLES2.core.internalformat.copy_tex_image.luminance8_alpha8_oes,Fail

1
src/gallium/drivers/i915/ci/deqp-i915-g33-flakes.txt
View File

@ -1 +0,0 @@
dEQP-GLES2.functional.shaders.random.texture.*

2
src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
View File

@ -157,7 +157,6 @@ spec@!opengl 1.1@clipflat,Fail
spec@!opengl 1.1@depthstencil-default_fb-clear,Fail
spec@!opengl 1.1@depthstencil-default_fb-copypixels,Fail
spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort,Fail
spec@!opengl 1.1@draw-pixel-with-texture,Fail
spec@!opengl 1.1@draw-pixels,Fail
spec@!opengl 1.1@drawpix-z,Fail
spec@!opengl 1.1@getteximage-formats,Crash
@ -671,7 +670,6 @@ spec@glsl-1.10@execution@glsl-fs-functions-5,Fail
spec@glsl-1.10@execution@glsl-fs-functions-6,Fail
spec@glsl-1.10@execution@glsl-fs-if-nested-loop,Fail
spec@glsl-1.10@execution@glsl-fs-loop-while-false-03,Fail
spec@glsl-1.10@execution@glsl-fs-texture-uniforms-share-same-unit,Fail
spec@glsl-1.10@execution@glsl-texcoord-array-2,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

2
src/gallium/drivers/i915/i915_fpc_emit.c
View File

@ -212,7 +212,7 @@ uint i915_emit_texld( struct i915_fp_compile *p,
ignore |= (0xf << UREG_CHANNEL_W_SHIFT);
}
if ( (coord & ~ignore ) != (k & ~ignore) ) {
if ( (coord & ~ignore ) != (k & ~ignore) || GET_UREG_TYPE(coord) == REG_TYPE_CONST) {
/* texcoord is swizzled or negated. Need to allocate a new temporary
* register (a utemp / unpreserved temp) won't do.
*/