summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-10-27Merge from Chromium at DEPS revision 614f7b807940HEADwebview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1android-m-preview-2android-m-preview-1android-m-previewub-webview-m40-releasemaster-soongmastermainTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Id4ce58057d5b9e69b71578ce272f4c580ff068de
2014-09-30Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at 9731cb962963bca8a05f3d0f6ea40c3a781f0537 This commit was generated by merge_from_chromium.py. Change-Id: I8b774ee18c889edd120179ae169dfb6b59243c9e
2014-09-26Remove headers for CL, EGL, GLES2, KHR, VGjamesr@chromium.org
In chromium we should never use these headers from mesa. We use the OpenGL ES 2.0 and KHR headers from khronos. Having duplicates in the tree is confusing and a recipe for disaster if the two ever diverge and different versions are used by different libraries, especially since they all use the same include guard so which version is seen by a particular target depends on the include path order. Original review on https://codereview.chromium.org/479683003/ Review URL: https://codereview.chromium.org/608893002 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@292163 0039d316-1c4b-4281-b951-d872f2087c98
2014-04-24Merge from Chromium at DEPS revision 265802android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewidea133-weekly-releaseBen Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ia490b10625692bf8dedb2a1d67598f1225b48225
2014-04-23Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at 457812d99a213dedf1c4cd38018ff48118d0c44f This commit was generated by merge_from_chromium.py. Change-Id: Ic73859c9d93f627c52d45a4df087a250a9bd261b
2014-04-22mesa: Disable use of "pragma export" on OS X. clang doesn't understand it.thakis@chromium.org
Filed upstream as crbug.com/365682 . The motivation is to let mesa no longer push -Wno-unknown-pragmas to all targets that depend on mesa. We used to have this change, but https://codereview.chromium.org/17005007 lost it. BUG=338759 R=dpranke@chromium.org Review URL: https://codereview.chromium.org/246843006 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@265279 0039d316-1c4b-4281-b951-d872f2087c98
2014-04-10Merge from Chromium at DEPS revision 262940Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I8895603818f261bf1b301f727708e144bec345d3
2014-04-04Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at 66c1c789ce3407472de9ed620c9f815639058835 This commit was generated by merge_from_chromium.py. Change-Id: Ifa1a905ec2859af448a916a2c061b8dfd5e32d38
2014-04-02Porting to x64 Android. Remove redefinitions of log2 and log2f.rmcilroy@chromium.org
BUG= R=kbr@chromium.org Review URL: https://codereview.chromium.org/216773005 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@261106 0039d316-1c4b-4281-b951-d872f2087c98
2014-03-18Merge from Chromium at DEPS revision 257591Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: If3a36be510d743e9885ee4ae9fac82b46599e315
2014-03-02Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at 3f79f50967bbf4fdaba7507a8d1526aa24eefd91 This commit was generated by merge_from_chromium.py. Change-Id: I872dc772b10b6bf7fb41bc2f4ff8f66116f2ce88
2014-03-02Disable optimization on _swrast_write_zoomed_stencil_spanscottmg@chromium.org
Otherwise, ICE on 2013 for optimized debug build (used for TSAN). R=timurrrr@chromium.org BUG=348397 Review URL: https://codereview.chromium.org/183923010 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@254411 0039d316-1c4b-4281-b951-d872f2087c98
2014-02-22Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at e510ef026f853574a76ff832d27b8292c03c707b This commit was generated by merge_from_chromium.py. Change-Id: I703b3f85c160609a234473304384bdfe001674eb
2014-02-21mesa compile fixes for Clang / VS2013hans@chromium.org
These functions are all defined in the standard library now, and Clang warns about non-static declaration followed by static declaration. R=scottmg@chromium.org BUG=82385 Review URL: https://codereview.chromium.org/174153004/ git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@252594 0039d316-1c4b-4281-b951-d872f2087c98
2014-02-21Merge from Chromium at DEPS revision 251904Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I3b9f02c0ee2ab503ae4d1ca14306c7da459ab628
2014-01-04Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at ff34f1e559362fbff2c693ed16effb3046dba8e9 This commit was generated by merge_from_chromium.py. Change-Id: I19399967c7fa96ed70d371e13b877bfa4cc68108
2013-12-16Updated GLintptr and GLsizeiptr to be the appropriate types on 64 bit Windowsbajones@chromium.org
BUG=326382 TBR=kbr@chromium.org Review URL: https://codereview.chromium.org/108043006 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@240938 0039d316-1c4b-4281-b951-d872f2087c98
2013-12-10am 8cd8c297: (-s ours) Merge remote-tracking branch \'origin/kitkat-dev\'android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-devBaligh Uddin
* commit '8cd8c297bbfd6731c852bbd23b77bca4e347353b': Initial empty repository
2013-11-01Merge remote-tracking branch 'origin/kitkat-dev'chromium_org-pre-replicationidea133Baligh Uddin
2013-10-31Initial empty repositoryBaligh Uddin
2013-10-31Merge from Chromium at DEPS revision 232015Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: If8ed8205965069f18d774f19c64be6d4387bed87
2013-10-22Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at e740c825b11773ebe636675977e5f79de253c745 This commit was generated by merge_from_chromium.py. Change-Id: Ib0311c69f91d994f2c93168dd5fbfaa54d492e95
2013-10-22mesa compile fixes for VS2013scottmg@chromium.org
- _Bool is defined in standard headers now - fpclassify is in the standard library R=marcheu@chromium.org BUG=288948 Review URL: https://codereview.chromium.org/32323009 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@229994 0039d316-1c4b-4281-b951-d872f2087c98
2013-10-17Fix a bug with Multiple Render Targets.hubbe@chromium.org
See https://code.google.com/p/chromium/issues/detail?id=308715 for more info. Review URL: https://codereview.chromium.org/27740005 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@229247 0039d316-1c4b-4281-b951-d872f2087c98
2013-07-17Merge from Chromium at DEPS revision r212014android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-devBen Murdoch
This commit was generated by merge_to_master.py. Change-Id: I0866d379bff2b2c456cf4135e561956e36e2e8a8
2013-07-10Merge from Chromium at DEPS revision r210036Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I70cb67e15b554fcdb60ff4929c76104911c75301
2013-07-04Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at 2a3406721cd61852bebd502c7a907cf07b7be731 This commit was generated by merge_from_chromium.py. Change-Id: Ida738bc5247e9b01dba5ad3be523c4a4eb1e6ddf
2013-07-04Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at 99703ab948d16a83979d70d595e48cc5a0f06880 This commit was generated by merge_from_chromium.py. Change-Id: I32908701d785f1e29810ce6f28e3007e38cefe09
2013-07-04Don't use strtod_l in Mesa on Androidmymax@amazon.com
Android includes a fix to asm/posix_types.h inside /ndk/toolchains/x86-4.7/prebuilt/linux-x86_64/lib/gcc/ i686-linux-android/4.7/include-fixed/asm/posix_types.h. That file #include_next's the real asm/posix_types.h, but then fixes (redefines) the __FD_ZERO macro. However, it also #includes features.h, which unconditionally defines _GNU_SOURCE. src/glsl/strtod.c assumes that if the _GNU_SOURCE macro is defined, that it can use locale_t, which isn't available on Android. Review URL: https://chromiumcodereview.appspot.com/18594002 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@210110 0039d316-1c4b-4281-b951-d872f2087c98
2013-07-04Can't #define assert() before including assert.h on Androidmymax@amazon.com
Android's assert.h #errors if assert() has already been defined. At least one file in mesa includes u_debug.h (which #defines assert()) before including assert.h. This makes sure that assert.h always gets included at the beginning of u_debug.h. Review URL: https://chromiumcodereview.appspot.com/18570002 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@210108 0039d316-1c4b-4281-b951-d872f2087c98
2013-06-21Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at 9511fddfee83830f3c0479b5dde791e87cecd9bd This commit was generated by merge_from_chromium.py. Change-Id: I2f217201fa94f0999c70bc858363e95928e35eec
2013-06-19Adding typedefs for EGLNative*Type in eglplatform.hmymax@amazon.com
BUG=238755 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/17452002 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@207256 0039d316-1c4b-4281-b951-d872f2087c98
2013-06-17In _mesa_add_parameter, in prog_parameter.c, |values| represents anmymax@amazon.com
array holding a variable number of values. These values get copied out of the array 4 at a time with the COPY_4V macro, however, the array might only contain a single element. In this case, ASAN reports a read-before-initialize because the last 3 of the 4 elements haven't been written to yet. This patch should be upstreamed to Mesa. BUG=238755 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/17122007 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@206770 0039d316-1c4b-4281-b951-d872f2087c98
2013-06-14Checked in sources which are normally autogenerated during Mesa's build process.kbr@chromium.org
Generating these sources requires the Python bindings for libxml2 to be installed, and that dependency causes significant problems for Chromium's build process. It is not feasible to add a dependency on a Python module requiring native libraries. Mesa's XML processors require validation against the DTD, and none of Python's built-in XML processors support validation. The only currently maintained validating XML parsers for Python require native libraries. Therefore it is not possible to rewrite Mesa's XML processors in pure Python. These sources were generated manually on Linux using a new gyp target. They compile and run successfully on Windows and Mac OS. This patch is not appropriate to upstream to the Mesa tree. BUG=238755 TBR=marcheu@chromium.org Review URL: https://codereview.chromium.org/17028009 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@206317 0039d316-1c4b-4281-b951-d872f2087c98
2013-06-14Changed typedefs for GLintptr and GLsizeiptr (and ARB variants) to work ↵kbr@chromium.org
around conflicts with Skia's typedefs in src/third_party/skia/include/gpu/gl/GrGLFunctions.h . There is a fundamental conflict between the OpenGL and OpenGL ES headers for these typedefs. Without this modification, src/ui/gl/gl_bindings_skia_in_process.cc fails to compile. This patch is not appropriate to upstream to Mesa. Additionally, there may be a different workaround available which would allow this patch to be reverted. BUG=238755 TBR=marcheu@chromium.org Review URL: https://codereview.chromium.org/16818021 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@206312 0039d316-1c4b-4281-b951-d872f2087c98
2013-06-14Disabled optimizations for a few files when compiled with Visualkbr@chromium.org
Studio due to the compiler taking an unreasonably long time. This patch should be upstreamed to the Mesa tree. BUG=238755 TBR=marcheu@chromium.org Review URL: https://codereview.chromium.org/16951009 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@206311 0039d316-1c4b-4281-b951-d872f2087c98
2013-06-14Incorporated verbatim Mesa 9.0.3 sources from http://mesa3d.org/ inkbr@chromium.org
preparation for upgrading the snapshot Chromium uses for testing. This CL is too large to upload to codereview.chromium.org. Committing it manually. BUG=238755 TBR=marcheu@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@206309 0039d316-1c4b-4281-b951-d872f2087c98
2013-06-14Deleted old, modified Mesa 7.9 sources in preparation for upgrade tokbr@chromium.org
Mesa 9.0.3. This CL is too large to upload to codereview.chromium.org. Committing it manually. BUG=238755 TBR=apatrick@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@206308 0039d316-1c4b-4281-b951-d872f2087c98
2013-06-11Merge from Chromium at DEPS revision r205460Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I00cddb0784deff70283a4384f310955f24c134de
2013-06-10Merge third_party/mesa/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/mesa.git at 6da96107e2467063c72e1ec5804f0618a6ce83d3 This commit was generated by merge_from_chromium.py. Change-Id: I235a6d60e80e6c5546a00c36bf054b4c45dc2c29
2013-06-10Initial empty repositoryChad Jones
2013-06-05Copied src/third_party/mesa/MesaLib to deps/third_party/mesa inkbr@chromium.org
preparation for managing this code via DEPS. BUG=238755 git-svn-id: svn://svn.chromium.org/chrome/trunk/deps/third_party/mesa@204346 0039d316-1c4b-4281-b951-d872f2087c98
2013-03-23mesa: Clean up redundant comparison in nvvertparse.c.hans@chromium.org
This was found by experimenting with a new Clang warning. BUG=none Review URL: https://chromiumcodereview.appspot.com/12662026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src/third_party/mesa/MesaLib@190116 0039d316-1c4b-4281-b951-d872f2087c98
2013-03-12Made Mesa use consistent *_FLOAT_TO_UBYTE conversions.ernstm@chromium.org
The optimized versions producd slightly different results than the un-optimized versions (used when DEBUG is defined). This caused inconsistent test results. BUG=181712 Review URL: https://chromiumcodereview.appspot.com/12764015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src/third_party/mesa/MesaLib@187688 0039d316-1c4b-4281-b951-d872f2087c98
2012-12-13Allows the ADDRESS_SANITIZER define to be used on Windows.sebmarchand@chromium.org
Asan is coming on Windows soon with SyzyAsan. We should be able to use the ADDRESS_SANITIZER define. The __attribute__ flag is compiler specific. BUG= Review URL: https://chromiumcodereview.appspot.com/11549005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src/third_party/mesa/MesaLib@172767 0039d316-1c4b-4281-b951-d872f2087c98
2012-12-12Plumb glDiscardFramebufferEXT entry point through command bufferjamesr@chromium.org
BUG= Review URL: https://chromiumcodereview.appspot.com/11465018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src/third_party/mesa/MesaLib@172468 0039d316-1c4b-4281-b951-d872f2087c98
2012-10-30Revert 165006 - Revert 165005 until skia_webkit.gyp is present everywhere.bungeman@chromium.org
TBR=bungeman@chromium.org Review URL: https://codereview.chromium.org/11344041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src/third_party/mesa/MesaLib@165007 0039d316-1c4b-4281-b951-d872f2087c98
2012-10-30Revert 165005 until skia_webkit.gyp is present everywhere.bungeman@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src/third_party/mesa/MesaLib@165006 0039d316-1c4b-4281-b951-d872f2087c98
2012-09-21Get real GPU memory values on NV+Linux and OS X. Add an interface to ↵ccameron@chromium.org
GLContext to query the GPU's total video memory. Note that this is the amount of video memory on the currently-rendering GPU, so different contexts will give different values, and the same context may give different values over time (for instance, on a Macbook Pro with graphics switching). Of note is that on a Macbook Pro with graphics switching enabled, the contexts don't move together between GPUs -- some stay on the integrated GPU while others use the discrete GPU. BUG=132994 Review URL: https://chromiumcodereview.appspot.com/10957009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src/third_party/mesa/MesaLib@157879 0039d316-1c4b-4281-b951-d872f2087c98
2012-08-21Fix the compile errors for mesa on Androidyongsheng.zhu@intel.com
There are some compile errors for mesa when trying to build gpu_tests on Android. They were fixed in the mesa upstream. So this patch combines 3 commits from mesa upstream. They are: 1) Commit eb0ff1a1c0 by chad@chad-versace.us: remove the use of fpu_control.h 2) Commit 504f92c739 by olvaffe@gmail.com: android has no log2f nor ffs 3) Commit 497baf4e4a by ian.d.romanick@intel.com: Use C-style system headers in C++ code to avoid issues with std:: namespace BUG=138226 TEST= Review URL: https://chromiumcodereview.appspot.com/10825442 git-svn-id: svn://svn.chromium.org/chrome/trunk/src/third_party/mesa/MesaLib@152502 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 17:12:56 +0000