OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: fix crashes on out of bound matrix access using constant index

Browse Source 
Fixes these piglit tests:
- spec@glsl-1.20@execution@matrix-out-of-bounds-access@fs-mat4-out-of-bounds-2
- spec@glsl-1.20@execution@matrix-out-of-bounds-access@fs-mat4-out-of-bounds-4
- spec@glsl-1.20@execution@matrix-out-of-bounds-access@fs-mat4-out-of-bounds-5

Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4998>
This commit is contained in:
Marcin Ślusarz
2020-05-11 23:26:40 +02:00
committed by Marge Bot
parent 7dcb1d272f
commit 16f1d8b391
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci/piglit/quick_shader.txt
View File

@@ -369,9 +369,6 @@ spec/glsl-1.10/execution/built-in-functions/fs-pow-float-float: fail
spec/glsl-1.10/execution/built-in-functions/vs-pow-float-float: fail
spec/glsl-1.10/preprocessor/extension-defined-test: skip
spec/glsl-1.10/preprocessor/extension-if-1: skip
spec/glsl-1.20/execution/matrix-out-of-bounds-access/fs-mat4-out-of-bounds-2: crash
spec/glsl-1.20/execution/matrix-out-of-bounds-access/fs-mat4-out-of-bounds-4: crash
spec/glsl-1.20/execution/matrix-out-of-bounds-access/fs-mat4-out-of-bounds-5: crash
spec/glsl-1.20/execution/vector-out-of-bounds-access/fs-vec4-out-of-bounds-1: crash
spec/glsl-1.20/execution/vector-out-of-bounds-access/fs-vec4-out-of-bounds-2: crash
spec/glsl-1.20/execution/vector-out-of-bounds-access/fs-vec4-out-of-bounds-4: crash
@@ -598,9 +595,9 @@ spec/nv_viewport_swizzle/viewport_swizzle: skip
summary:
name: results
---- --------
pass: 15778
pass: 15781
fail: 104
crash: 178
crash: 175
skip: 315
timeout: 0
warn: 0

13
src/compiler/glsl/ir_constant_expression.cpp
View File

@@ -955,6 +955,19 @@ ir_dereference_array::constant_expression_value(void *mem_ctx,
const glsl_type *const column_type = array->type->column_type();
/* Section 5.11 (Out-of-Bounds Accesses) of the GLSL 4.60 spec says:
*
* In the subsections described above for array, vector, matrix and
* structure accesses, any out-of-bounds access produced undefined
* behavior....Out-of-bounds reads return undefined values, which
* include values from other variables of the active program or zero.
*/
if (idx->value.i[0] < 0 || column >= array->type->matrix_columns) {
ir_constant_data data = { { 0 } };
return new(mem_ctx) ir_constant(column_type, &data);
}
/* Offset in the constant matrix to the first element of the column
* to be extracted.
*/