aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 55fd7dc9: am 4ea6a758: am 90ae7159: am a88b03e1: am d8166872: (-s ours) ↵bohu2015-02-170-0/+0
|\ | | | | | | | | | | | | back port gles fix to api 16 * commit '55fd7dc90d1300833413b4f7a8dc5ee8f4b1b204': back port gles fix to api 16
| * am 4ea6a758: am 90ae7159: am a88b03e1: am d8166872: (-s ours) back port gles ↵bohu2015-02-170-0/+0
| |\ | | | | | | | | | | | | | | | | | | fix to api 16 * commit '4ea6a758063fbeb61a08a274796beec888596fce': back port gles fix to api 16
| | * am 90ae7159: am a88b03e1: am d8166872: (-s ours) back port gles fix to api 16bohu2015-02-170-0/+0
| | |\ | | | | | | | | | | | | | | | | * commit '90ae715989ab46e20728df1b4614a94166193545': back port gles fix to api 16
| | | * am a88b03e1: am d8166872: (-s ours) back port gles fix to api 16bohu2015-02-170-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit 'a88b03e155d2600122083726653b10a4eb90d2c8': back port gles fix to api 16
| | | | * am d8166872: (-s ours) back port gles fix to api 16bohu2015-02-170-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd81668725d81d6b3020b08e6fbc72acf3dc1c0c8': back port gles fix to api 16
| | | | | * back port gles fix to api 16bohu2015-02-0313-61/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following CLs are back ported: 717e625415c4398431b84851ba1b76d8c59ae9cf Add shader version to glGetString 32c30975ea654b9654ad9dade0d25b9856e63f1b Add parameters validation to glShaderSource() API b0c7cce25bf9323a359800a86c0c7609db2acea4 Fix eglDestroyContext and glTexImage2D 2fc65202c214640c55b52c29bbc9213170d0b533 handles glGetBooleanv when value is nonboolean beda8027439b9c20475b8a3d379823d09fca3abb Properly initialize GLClientState's m_states 84684ec571a1db94e32a67cb7d154ab562dd0d7f Unbind buffer when buffer is deleted 89b7aac84f8babab93ff5326ad492164d971c421 Handle empty data parameter in glTexSubImage2D_enc adb0f74f792ba7bca20257b9c0ea41ebda9bb229 Allow glGetProgramInfoLog_enc to have empty length b31166704ddb7751619cf0bbc4f2f4575c0ad3c4 Guard against negative buffer size 641f35af08a0a4c46586a592ff4e703e866d581a Guard against negative width and height 9d18698dd8da15937f80e5476d73400a011934be Handle empty buffer in QemuPipeStream::writeFully 40a674e0d0acac87aa25eb9de720dc2fb07d9e4f Fix emulator crashes on glDrawElements command 7a2929cd6548693b581c17ba69308a49e03c56be Remove display initialization from eglGetProcAddress API Change-Id: Ia3c18f714812a8c90593c6a0260c92dc18c56da3
* | | | | | Merge "Update template location for SDK build"Josiah Gaskin2013-08-01273-6436/+4
|\ \ \ \ \ \
| * | | | | | Update template location for SDK buildJosiah Gaskin2013-07-31273-6436/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes templates from the SDK source tree (from sdk/templates) and points the build/tools.atree build location file to their new location in tools/base/templates Change-Id: Id37b24eceaae6dcc0b3bf5078a759a337cb13467
* | | | | | Merge "Change references from sdktestutils -> testutils"Siva Velusamy2013-07-293-3/+3
|\ \ \ \ \ \
| * | | | | | Change references from sdktestutils -> testutilsSiva Velusamy2013-07-293-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23e06a19d033582a86ec9dc7e90920a508046f9c
* | | | | | | Merge "Rename sdktestutils -> testutils"Siva Velusamy2013-07-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Rename sdktestutils -> testutilsSiva Velusamy2013-07-291-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ib0599b30649e46c9a8a51fc4f3d56caf13dd7032
* | | | | | Merge "Change import path to sparse array"Siva Velusamy2013-07-294-5/+5
|\ \ \ \ \ \
| * | | | | | Change import path to sparse arraySiva Velusamy2013-07-254-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9862a6ebc25b4c13488b9fe0451bdfd8f5a6ef26
* | | | | | | Merge "Add clarifying comment."Siva Velusamy2013-07-261-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Add clarifying comment.Siva Velusamy2013-07-251-0/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If data is of float type, then we assume that it is meant for the alpha channel even if it is marked as R/G or B channels. Change-Id: I8a95c3533def4a5bdb2b49e9489674bffb2a0cef
* | | | | | | Merge "Fix gldebugger formatter test"Siva Velusamy2013-07-251-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix gldebugger formatter testSiva Velusamy2013-07-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife2254ec1e1500d36d68add788bfa7699d9eb2fa
* | | | | | | | Merge "Add support for additional ES3 state, primarily for textures"Siva Velusamy2013-07-256-20/+479
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add support for additional ES3 state, primarily for texturesSiva Velusamy2013-07-256-20/+479
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds the following to support ES3: - all new constant definitions (GLEnum) - new methods in entries.in - additional state for texture properties Change-Id: Ia43fac49790cc7b07e7c9d295b9915e416a3b2a8
* | | | | | | Merge "Support dynamically linked llvm-rs-cc"Xavier Ducrohet2013-07-252-5/+14
|\ \ \ \ \ \ \
| * | | | | | | Support dynamically linked llvm-rs-ccXavier Ducrohet2013-07-252-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4f8ef81c7a2b5a9bccb2cf6283b80fe9bbe4cc64
* | | | | | | | Merge "Use systrace html prefix and suffix from platform tools"Siva Velusamy2013-07-253-46/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | Use systrace html prefix and suffix from platform toolsSiva Velusamy2013-07-253-46/+39
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parts of the systrace html file were duplicated in the source code (HTML_PREFIX and SUFFIX) as well as in the systrace scripts. This CL picks up that content from data files present in the systrace folder and removes the duplicated content from the source files. Change-Id: I517d23faa14022a666a7f314ffbb34187b1fed1f
* | | | | | | | Merge "Fix renderscript issue on windows."Xavier Ducrohet2013-07-253-13/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Fix renderscript issue on windows.Xavier Ducrohet2013-07-253-13/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was quoting paths send to the command line (even though it's not required since the exec tasks an array of args instead of a single line). However if the paths end with a trailing file separator then, on windows only, this had the effect of escaping the quote, basically adding with the path: "c:\foo\" -> c:\foo" Change-Id: Ia77b6404e69fda8df457fd1a56478296ee455898
* | | | | | am 3b49d504: Merge "Fix gradle export on windows."Xavier Ducrohet2013-07-241-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3b49d50456dcce9e9928132a149f0ca3cb5507c2': Fix gradle export on windows.
| * \ \ \ \ \ Merge "Fix gradle export on windows."Xavier Ducrohet2013-07-241-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix gradle export on windows.Xavier Ducrohet2013-07-241-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I9166dafe997f4d9e7988e7f123759952fdea4ba4
* | | | | | | am 77ba389d: Merge "Remove systrace from tools.atree"Siva Velusamy2013-07-221-8/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '77ba389d87d691d834be910ece683576a90aa893': Remove systrace from tools.atree
| * | | | | | Merge "Remove systrace from tools.atree"Siva Velusamy2013-07-221-8/+0
| |\ \ \ \ \ \
| | * | | | | | Remove systrace from tools.atreeSiva Velusamy2013-07-191-8/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Systrace should be released along with every platform release. Change-Id: Ic6c728906aa6af01ca98200a18dd4685d403f3e0
* | | | | | | am 9d8f40dd: Merge changes Ie793b684,I083290cdRaphael Moll2013-07-162-50/+141
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d8f40dd2a72af3cc75e34bcdbdcf8f7c7512f2c': Change create_symlinks to use gradle-based libraries. ADT: fix missing lib dependency in ADT base.
| * | | | | | Merge changes Ie793b684,I083290cdRaphael Moll2013-07-162-50/+141
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Change create_symlinks to use gradle-based libraries. ADT: fix missing lib dependency in ADT base.
| | * | | | | | Change create_symlinks to use gradle-based libraries.Raphael Moll2013-07-161-50/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of this change, each section clearly identifies where libraries should be built from. Example from the source: LIBS="base:common make:ant-glob ... swt:ddmuilib" means that: - "common" is taken from tools/base (gradle) - "ddmuilib" is taken from tools/swt (gradle) - "sdkstats" is built using 'make', in which case a prebuilt/devtools JAR will be used if it can be found. Change-Id: Ie793b684f303566a307ee3ff6d6d72db8d26996e
| | * | | | | | ADT: fix missing lib dependency in ADT base.Raphael Moll2013-07-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | plugin-base depends on http mime (from the apache libs) but for some reason it wasn't in the build path. Change-Id: I083290cddd45dbf718bbd5403b28ed74865a73ac
* | | | | | | | am b251da9c: Merge "Force containers to be exported if maven is not used."Xavier Ducrohet2013-07-121-12/+69
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b251da9ccb6a00567c10c80579c0d7039e2c837c': Force containers to be exported if maven is not used.
| * | | | | | | Merge "Force containers to be exported if maven is not used."Xavier Ducrohet2013-07-121-12/+69
| |\ \ \ \ \ \ \
| | * | | | | | | Force containers to be exported if maven is not used.Xavier Ducrohet2013-07-121-12/+69
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I662c1e3bf7d671c43cc2d9153caee98dec988500
* | | | | | | | am 49fa77c2: Merge "Fix error detection on ExportStatus."Xavier Ducrohet2013-07-121-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '49fa77c24582b0715f04d0ef7a6439ea58108d52': Fix error detection on ExportStatus.
| * | | | | | | Merge "Fix error detection on ExportStatus."Xavier Ducrohet2013-07-121-1/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Fix error detection on ExportStatus.Xavier Ducrohet2013-07-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d70bb9857e065d5517c756e4913ac8248edbb6c
* | | | | | | | | am 31694ac7: Merge "Fix RenderThreadInfo lifetime and cleanup"Jesse Hall2013-07-116-62/+45
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '31694ac75cee03be2fd13e978c61797f0b5c72c4': Fix RenderThreadInfo lifetime and cleanup
| * | | | | | | | Merge "Fix RenderThreadInfo lifetime and cleanup"Jesse Hall2013-07-116-62/+45
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix RenderThreadInfo lifetime and cleanupJesse Hall2013-06-186-62/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a TLS destructor, RenderThreadInfo is now an automatic variable of RenderThread::Main(), so is automatically destroyed on thread exit. RenderThread::Main() now explicitly unbinds the thread's context and surfaces from the FrameBuffer, ensuring that the thread has released all references before it exits. This fixes a bug where RenderThreadInfo's destructor was releasing the references in the TLS destructor, which caused ColorBuffer's destructor to call FrameBuffer::bind_locked() when the FrameBuffer lock wasn't held. By clearing the references in FrameBuffer::bindContext(), locking around destruction happens correctly. Change-Id: I617cea838d5f352a597ccc6d3dbd8f9c08cb91bd
* | | | | | | | | am 24162a9d: Merge "Update Gradle export to use version 0.5.+"Xavier Ducrohet2013-07-111-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '24162a9d0d1b7feb6aee44de8445ff0d04d48612': Update Gradle export to use version 0.5.+
| * | | | | | | | Merge "Update Gradle export to use version 0.5.+"Xavier Ducrohet2013-07-111-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update Gradle export to use version 0.5.+Xavier Ducrohet2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia623df2936b2ccbc63acc3cf5dc26dcdcc806562
* | | | | | | | | | am 48c71bce: Merge "Gradle Export: also redirect the build type source ↵Xavier Ducrohet2013-07-111-0/+12
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | locations." * commit '48c71bce5504273e2cac890a69b058ab3960cea3': Gradle Export: also redirect the build type source locations.
| * | | | | | | | | Merge "Gradle Export: also redirect the build type source locations."Xavier Ducrohet2013-07-111-0/+12
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /