Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8d6dd69 authored by Miao Wang's avatar Miao Wang Committed by Android Git Automerger
Browse files

am 7d581218: am 01060a33: Merge "[RenderScript] fix edges cases about... 

am 7d581218: am 01060a33: Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev

* commit '7d581218':
  [RenderScript] fix edges cases about Transpose for SYMM & SYR2K
parents 4cff05e1 7d581218

rs/java/android/renderscript/ScriptIntrinsicBLAS.java

+6 −6
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
            }

        } else {

            if (A != null) {

                if (TransA != NO_TRANSPOSE) {

                if (TransA == TRANSPOSE || TransA == CONJ_TRANSPOSE) {

                    aN = A.getType().getY();

                    aM = A.getType().getX();

                } else {
@@ -1021,7 +1021,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
                }

            }

            if (B != null) {

                if (TransB != NO_TRANSPOSE) {

                if (TransB == TRANSPOSE || TransB == CONJ_TRANSPOSE) {

                    bN = B.getType().getY();

                    bM = B.getType().getX();

                } else {
@@ -1272,7 +1272,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
        validateUplo(Uplo);

        validateSYR2K(Element.F32(mRS), Trans, A, B, C);

        int K = -1;

        if (Trans == TRANSPOSE) {

        if (Trans != NO_TRANSPOSE) {

            K = A.getType().getY();

        } else {

            K = A.getType().getX();
@@ -1283,7 +1283,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
        validateUplo(Uplo);

        validateSYR2K(Element.F64(mRS), Trans, A, B, C);

        int K = -1;

        if (Trans == TRANSPOSE) {

        if (Trans != NO_TRANSPOSE) {

            K = A.getType().getY();

        } else {

            K = A.getType().getX();
@@ -1294,7 +1294,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
        validateUplo(Uplo);

        validateSYR2K(Element.F32_2(mRS), Trans, A, B, C);

        int K = -1;

        if (Trans == TRANSPOSE) {

        if (Trans != NO_TRANSPOSE) {

            K = A.getType().getY();

        } else {

            K = A.getType().getX();
@@ -1305,7 +1305,7 @@ public final class ScriptIntrinsicBLAS extends ScriptIntrinsic { 
        validateUplo(Uplo);

        validateSYR2K(Element.F64_2(mRS), Trans, A, B, C);

        int K = -1;

        if (Trans == TRANSPOSE) {

        if (Trans != NO_TRANSPOSE) {

            K = A.getType().getY();

        } else {

            K = A.getType().getX();