aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of ↵cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2mr1.1-stagingSteve Kondik2013-02-124-1/+15
|\ | | | | | | | | | | https://android.googlesource.com/platform/frameworks/compile/slang into 1.1 Android 4.2.2 release 1
| * am 68c072cf: Fix overly strict check for float3 in structures.Stephen Hines2012-11-304-1/+15
| |\ | | | | | | | | | | | | * commit '68c072cfbb2430b55478350ac74aa5279ae4d9be': Fix overly strict check for float3 in structures.
| | * Fix overly strict check for float3 in structures.Stephen Hines2012-11-294-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | We were accidentally being too strict and generating an error for float3 in structures, even when they were not exported. This change restores the original functionality. Change-Id: I8f0b5881d670c37a23ca2efc575440a083befcbe
| | |
| | \
| *-. \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
| |\ \ \ | |_|/ / |/| | / | | |/ | |/| Change-Id: I10aa690a24bdda6d980ae5ab4f90ab5fa02ba165
* | | merge in jb-mr1-release history after reset to jb-mr1-devcm-10.1-M1The Android Automerger2012-10-160-0/+0
|\ \ \ | |/ / |/| |
| * | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| |\ \
| | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | |\ \
* | | | | Only generate getFieldID_*() for non-Pointer (bind) types.Stephen Hines2012-10-152-10/+19
|/ / / / | | | | | | | | | | | | | | | | Bug: 7318821 Change-Id: Ic043f75a1a1a2a6f4a0b6d90ab3f1d053012d8c7
| | | * merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| |_|/| |/| | |
| | | * merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | |/| | |/|/
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-260-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-200-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-140-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-130-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-060-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-050-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | | | | | | | |\
| | | | | | | | | * Expand case range values for legacy BitcodeWriter.Shih-wei Liao2012-08-064-10/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8a9319c751c37f42d90476fd8de213a9a10bd07d
* | | | | | | | | | Merge "Add support for getting arbitrary kernel and field IDs." into jb-mr1-devTim Murray2012-10-121-3/+37
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add support for getting arbitrary kernel and field IDs.Tim Murray2012-10-101-3/+37
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 7318821 Change-Id: I7f5999a8c6e6c2eb55d1bb502033eb9be02e55a8
* | | | | | | | | Validate FS (and RS) ASTs.Stephen Hines2012-10-1124-84/+502
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new RSCheckAST class that is used to handle validation of the final AST. The checks include existing RS checks (for accepted types) and new checks for Filterscript (like disallowing pointers, unions and > 32 bit types completely). The refactoring also fixes a subtle union bug that existed in prior versions of llvm-rs-cc. We also add an implicit pragma for "rs_fp_relaxed" by default on Filterscript. Bug: 7166741 Change-Id: Ia077783b4caba0bbd89df2ab3827e9f4d1009eea
* | | | | | | | | Fix teardown bug for multiple files without pragma.Stephen Hines2012-10-117-11/+23
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This previously caused a segmentation fault in llvm-rs-cc. We were improperly using the DiagnosticsEngine after we had reset() everything. Bug: 7202787 Change-Id: Ic8522566ef257e70f16caf34b89f6a8e012908c5
* / / / / / / / Switch to FieldPacker for signed sub-integer types.Stephen Hines2012-09-251-1/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue here is that all of our small Java primitive types (byte, short, char) get promoted/passed as int. This in turn causes our setVar() to do a 4-byte memcpy() instead of the proper (smaller) amount. Bug: 6865598 Change-Id: I404c3bb6024686d1274229a73feec1e6c7e3fc7b
* / / / / / / Support for pass-by-value kernels.Stephen Hines2012-09-1921-10/+284
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows the JB-mr1+ target API to declare compute kernels using "__attribute__((kernel))". This disables the use of pointers in the function signature and forces any output to be explicitly returned and input to be passed only by value. We still allow the user to add x, y coordinates if they want them. Bug: 7166741 Change-Id: I1407fceefb11c7d6c17221ca156cfce443c2b218
* | | | | | Merge "Fix up slang for merge through LLVM r163557." into jb-mr1-devStephen Hines2012-09-131-28/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix up slang for merge through LLVM r163557.Stephen Hines2012-09-101-28/+34
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt to use of ArrayRef instead of C array + length pairs for some types of argument passing. Change-Id: I133c059f32ae1b2e55ebb2473e642faa62d49714
* / / / / Simpler ScriptC constructorsStephen Hines2012-09-121-0/+27
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change replaces the old 3-argument version of reflected ScriptC constructors with a new single argument (just the RenderScript object). We can do this safely because there are lookup functions for Resources and resource IDs directly in the Android API (and accessible via the RenderScript object). For now, we are still reflecting the legacy version of the constructor as well, since all existing app source code would be using it. Change-Id: I362d6e2bea0f580630b5da9049df029b0f8d7620
* | | | Merge "Fix up slang for LLVM upstream merge to r162314." into jb-mr1-devStephen Hines2012-09-053-13/+23
|\ \ \ \ | |/ / / |/| | |
| * | | Fix up slang for LLVM upstream merge to r162314.Stephen Hines2012-08-233-13/+23
| |/ / | | | | | | | | | Change-Id: Id3471daa7eee87c19c46dab8ffd972d52183440a
* / / Structs containing vectors of dimension 3 cannot be exported before ICS.Stephen Hines2012-08-314-0/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | BUG=5609007 BUG=34600 (http://code.google.com/p/android/issues/detail?id=34600) We forbid the use of things like float3 in exported structures for older target APIs, because it results in a runtime exception every time. This is due to not padding the elements appropriately on the driver-side, while the LLVM representation is padded. Change-Id: I297af3418e733f0ab3996999be4a8f746f24da40
* | Merge "Add RS-specific check forbidding array parameters in exported ↵Stephen Hines2012-08-072-1/+15
|\ \ | | | | | | | | | functions." into jb-mr1-dev
| * | Add RS-specific check forbidding array parameters in exported functions.Stephen Hines2012-08-042-1/+15
| |/ | | | | | | | | | | BUG=6902660 Change-Id: I31f0f2b51026edf450e920a5dd49810f4b191eb0
* / Expand case range values for legacy BitcodeWriter.Shih-wei Liao2012-08-054-10/+170
|/ | | | Change-Id: I8a9319c751c37f42d90476fd8de213a9a10bd07d
* Add RS package name option + support.Stephen Hines2012-08-0311-24/+63
| | | | | | | | | | | | | Usage: llvm-rs-cc -rs-package-name=android.renderscript ... or llvm-rs-cc -rs-package-name android.renderscript ... This allows us to reflect a different import path for our base RS classes. The default value is "android.renderscript", resulting in a reflection that produces "import android.renderscript.*;". Change-Id: Icf7e83b963ba70c803899697f49b41fdfb9586e7
* Fix build.Shih-wei Liao2012-08-031-0/+1
| | | | Change-Id: I05078283396a9f85b176c930a9f6333f1d02bfae
* Apply changes to migrate to CLANG-160673-20120724.Shih-wei Liao2012-08-027-8/+15
| | | | Change-Id: I666df2ff91532318883dd48ea1249178b2ebda81
* Add test for constant array arguments to functions.Stephen Hines2012-08-013-0/+10
| | | | | | BUG=6902660 Change-Id: Ie4766fd6fe51eb4f6b195c91d44f27c3f6b83458
* Update llvm-rs-cc version information for JB-MR1.Stephen Hines2012-08-013-3/+5
| | | | Change-Id: I30e4212d7a5553534fae49be451d335de79bfcf3
* Set LangOpts.Renderscript = 1.Stephen Hines2012-08-011-0/+1
| | | | Change-Id: I7f80d124d11eeed776ce3acd520297fc0c3f08f6
* am 6b071c38: Reconcile with jb-releaseThe Android Open Source Project2012-07-270-0/+0
|\ | | | | | | * commit '6b071c38cda21c679c18310a823c17dad32e8ea1':
| * Reconcile with jb-releaseThe Android Open Source Project2012-07-270-0/+0
| |\ | | | | | | | | | Change-Id: I979a9c3a28cf2b41f42ef66b5555f0efecbef672
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-07-180-0/+0
| | | |\ | | | |/ | | |/|
* | | | am fb6467b1: am 07ab0292: Merge "Fix reflection of setters for unsigned ↵Stephen Hines2012-07-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | primitive types." * commit 'fb6467b1b4d24add56845ae0c0a84fde04d3ede9': Fix reflection of setters for unsigned primitive types.
| * | | am 07ab0292: Merge "Fix reflection of setters for unsigned primitive types."Stephen Hines2012-07-256-29/+116
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '07ab0292b39be7b1f0f9387300fa3382528cf621': Fix reflection of setters for unsigned primitive types.
| | * \ \ Merge "Fix reflection of setters for unsigned primitive types."Stephen Hines2012-07-256-29/+116
| | |\ \ \
| | | * | | Fix reflection of setters for unsigned primitive types.Stephen Hines2012-07-256-29/+116
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=6764163 We now generate set_*() functions for unsigned types by creating a single element FieldPacker and stuffing it with the larger Dalvik type. Reusing FieldPacker in this way allows us to validate that the input is non-negative and within the appropriate range (i.e. not really using more bits than the unsigned C type should). This change also fixes a subtle race where the Dalvik and script side can disagree about a variable's value. All set_*() methods need to be synchronized, and we must do the Dalvik update after validating the input data. Change-Id: I7b2371206848ebbf0b0752779cb6c98cec1ab5f6
* | / / / Fix reflection of setters for unsigned primitive types.Stephen Hines2012-07-246-29/+116
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG=6764163 We now generate set_*() functions for unsigned types by creating a single element FieldPacker and stuffing it with the larger Dalvik type. Reusing FieldPacker in this way allows us to validate that the input is non-negative and within the appropriate range (i.e. not really using more bits than the unsigned C type should). This change also fixes a subtle race where the Dalvik and script side can disagree about a variable's value. All set_*() methods need to be synchronized, and we must do the Dalvik update after validating the input data. Change-Id: I7b2371206848ebbf0b0752779cb6c98cec1ab5f6
* | | | Reconcile with jb-mr0-releaseThe Android Open Source Project2012-07-190-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: I8d848c6cd34a68cb848e284bdc840e771a0f201c
| * \ \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-170-0/+0
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 18:45:35 +0000