fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 14:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: ir_function_param_visitor::visit_enter always true condition

Browse source 
The condition

!param->type->is_vector() || !param->type->is_scalar()

alawys evaluates to true:

* type is not scalar or vector -> true
* type is vector, i.e. num_components > 1 -> num_components == 1 is
  false and !is_scalar() == true
* type is scalar, i.e. num_components == 1 -> num_components > 1 is
  false and !is_vector() == true

There is no comment explaining why such code has been written, therefore
this seems to be a mistake.

To maintain consistency with the surrounding code,
glsl_type_is_scalar_or_vector has been used instead of
replacing || with &&.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24914>
This commit is contained in:
Piotr Kocia 2023-08-28 22:39:59 +02:00 • committed by Timothy Arceri
parent 5d203c4ae0
commit 8019a1b929
6 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/broadcom/ci/traces-broadcom.yml
View file

@ -120,7 +120,7 @@ traces:
minetest/minetest-v2.trace:
broadcom-rpi4:
checksum: 09e693eae151f992c621ad8d0da3151d
checksum: 88a5c82db5ce868c81fa1d6e0f6d8dc9
neverball/neverball-v2.trace:
broadcom-rpi4:

2
src/compiler/glsl/glsl_to_nir.cpp
View file

@ -163,7 +163,7 @@ public:
return visit_continue;
foreach_in_list(ir_variable, param, &ir->parameters) {
if (!param->type->is_vector() || !param->type->is_scalar()) {
if (!glsl_type_is_vector_or_scalar(param->type)) {
unsupported = true;
return visit_stop;
}

1
src/freedreno/ci/freedreno-a618-fails.txt
View file

@ -1,5 +1,4 @@
KHR-GL46.gpu_shader_fp64.fp64.max_uniform_components,Fail
KHR-GL46.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail
KHR-GL46.shader_image_load_store.basic-allFormats-store,Fail
KHR-GL46.shader_image_load_store.basic-allTargets-store,Fail
KHR-GL46.shading_language_420pack.binding_images,Fail

1
src/freedreno/ci/freedreno-a630-fails.txt
View file

@ -1,6 +1,5 @@
KHR-GL46.gpu_shader_fp64.fp64.max_uniform_components,Fail
KHR-GL46.shader_subroutine.control_flow_and_returned_subroutine_values_used_as_subroutine_input,Fail
KHR-GL46.shader_image_load_store.basic-allFormats-store,Fail
KHR-GL46.shading_language_420pack.binding_images,Fail

4
src/freedreno/ci/traces-freedreno.yml
View file

@ -376,7 +376,7 @@ traces:
text: missing 3/4 of rendered image
checksum: e7f01e62180b60aef8c67fc4977c90d1
freedreno-a530:
checksum: 71f46ff29ab058f89c745ddede5cc907
checksum: 777ecb806510d9a038a0d06d44deeb6f
freedreno-a618:
label: [skip]
freedreno-a630:
@ -385,7 +385,7 @@ traces:
One of the material textures appears brighter on freedreno than
i965 in a way that is probably wrong.
zink-a618:
checksum: e64bcc59d61d1c75ce5eeb109343d9bd
checksum: cf66297fa8e41282e67d15e41d7ff327
zink-a630:
checksum: e64bcc59d61d1c75ce5eeb109343d9bd

2
src/gallium/drivers/zink/ci/traces-zink.yml
View file

@ -35,7 +35,7 @@ traces:
checksum: 433b69bea68cfe81914b857bbdc60ea5
gputest/pixmark-piano-v2.trace:
gl-zink-anv-tgl:
checksum: b1c96546107d8a7c01efdafdd0eabd21
checksum: 30d97d06acd16a231260ee29cc1adbb6
gputest/triangle-v2.trace:
gl-zink-anv-tgl:
checksum: 5f694874b15bcd7a3689b387c143590b