Skip to content

Commit

Permalink
Add const matrix multiply test
Browse files Browse the repository at this point in the history
Test case ported from an ANGLE regression test.

New tests:

dEQP-GLES3.functional.shaders.constants.const_mat_multiply*

Components: AOSP

Chromium issue: 912508

Change-Id: I5ecc13af8f8e7a5d5a50126ea609e8ad6fab185b
  • Loading branch information
paulthomson authored and alegal-arm committed Jan 18, 2019
1 parent a9967f4 commit c335f24
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 0 deletions.
2 changes: 2 additions & 0 deletions android/cts/master/gles3-master.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1411,6 +1411,8 @@ dEQP-GLES3.functional.shaders.constants.const_float_assign_variable_2_vertex
dEQP-GLES3.functional.shaders.constants.const_float_assign_variable_2_fragment
dEQP-GLES3.functional.shaders.constants.const_float_assign_user_func_vertex
dEQP-GLES3.functional.shaders.constants.const_float_assign_user_func_fragment
dEQP-GLES3.functional.shaders.constants.const_mat_multiply_vertex
dEQP-GLES3.functional.shaders.constants.const_mat_multiply_fragment
dEQP-GLES3.functional.shaders.constants.int_decimal_vertex
dEQP-GLES3.functional.shaders.constants.int_decimal_fragment
dEQP-GLES3.functional.shaders.constants.int_octal_vertex
Expand Down
20 changes: 20 additions & 0 deletions data/gles3/shaders/constants.test
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,26 @@ case const_float_assign_user_func
""
end

case const_mat_multiply
version 300 es
values { output vec2 out0 = vec2(4.0, 4.0); }
both ""
#version 300 es
precision mediump float;
${DECLARATIONS}

const mat4x2 matA = mat4x2(2.0, 4.0, 8.0, 16.0, 32.0, 64.0, 128.0, 256.0);
const mat4x2 matB = mat4x2(1.0/2.0, 1.0/4.0, 1.0/8.0, 1.0/16.0, 1.0/32.0, 1.0/64.0, 1.0/128.0, 1.0/256.0);

void main()
{
mat4x2 result = matrixCompMult(matA, matB);
out0 = result * vec4(1.0, 1.0, 1.0, 1.0);
${OUTPUT}
}
""
end

case int_decimal
version 300 es
values { output int out0 = 7; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1414,6 +1414,8 @@ dEQP-GLES3.functional.shaders.constants.const_float_assign_variable_2_vertex
dEQP-GLES3.functional.shaders.constants.const_float_assign_variable_2_fragment
dEQP-GLES3.functional.shaders.constants.const_float_assign_user_func_vertex
dEQP-GLES3.functional.shaders.constants.const_float_assign_user_func_fragment
dEQP-GLES3.functional.shaders.constants.const_mat_multiply_vertex
dEQP-GLES3.functional.shaders.constants.const_mat_multiply_fragment
dEQP-GLES3.functional.shaders.constants.int_decimal_vertex
dEQP-GLES3.functional.shaders.constants.int_decimal_fragment
dEQP-GLES3.functional.shaders.constants.int_octal_vertex
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1416,6 +1416,8 @@ dEQP-GLES3.functional.shaders.constants.const_float_assign_variable_2_vertex
dEQP-GLES3.functional.shaders.constants.const_float_assign_variable_2_fragment
dEQP-GLES3.functional.shaders.constants.const_float_assign_user_func_vertex
dEQP-GLES3.functional.shaders.constants.const_float_assign_user_func_fragment
dEQP-GLES3.functional.shaders.constants.const_mat_multiply_vertex
dEQP-GLES3.functional.shaders.constants.const_mat_multiply_fragment
dEQP-GLES3.functional.shaders.constants.int_decimal_vertex
dEQP-GLES3.functional.shaders.constants.int_decimal_fragment
dEQP-GLES3.functional.shaders.constants.int_octal_vertex
Expand Down

0 comments on commit c335f24

Please sign in to comment.