Граф коммитов

486 Коммитов

Автор SHA1 Сообщение Дата
Austin Kinross 4085347266 Disable warning 4530 in the libANGLE GN project
Change-Id: I56b5428f40a294248305dff168b9b0bb7b0a9bcc
Reviewed-on: https://chromium-review.googlesource.com/249240
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2015-02-12 21:27:38 +00:00
Jamie Madill 562e81bbcc Fix Linux build, and update BUILD.gn.
Re-re-land with fixes for Linux and Android.

We were getting multiply defined symbol errors on Linux for some
stuff in the common sources. Switch to using a static lib target
for the common sources, and also sync BUILD.gn with the latest gyp.

BUG=angle:773

Change-Id: Ia2d52978a167c532e5e76cb711de589855eff44e
Reviewed-on: https://chromium-review.googlesource.com/240553
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2015-01-14 20:57:57 +00:00
Jamie Madill 433c85d3c0 Revert "Fix Linux build, and update BUILD.gn."
Still more build failures, different ones this time.

This reverts commit 9f8a57c641.

Change-Id: I7bea8e24403d92ca4ecb2ee0f24f9e065db5366d
Reviewed-on: https://chromium-review.googlesource.com/240550
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2015-01-13 22:52:29 +00:00
Jamie Madill 9f8a57c641 Fix Linux build, and update BUILD.gn.
Re-land with fixes for Android.

We were getting multiply defined symbol errors on Linux for some
stuff in the common sources. Switch to using a static lib target
for the common sources, and also sync BUILD.gn with the latest gyp.

BUG=angle:773

Change-Id: Id3edecc633b1c4be205558137c91baf87f256156
Reviewed-on: https://chromium-review.googlesource.com/240145
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2015-01-13 20:44:19 +00:00
Jamie Madill 04184fb046 Revert "Fix Linux build, and update BUILD.gn."
This reverts commit ed409f938b.

Change-Id: I208a2c43c73e99ae95988c6d81ed64691bd8a99f
Reviewed-on: https://chromium-review.googlesource.com/239900
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2015-01-09 16:51:27 +00:00
Jamie Madill ed409f938b Fix Linux build, and update BUILD.gn.
We were getting multiply defined symbol errors on Linux for some
stuff in the common sources. Switch to using a static lib target
for the common sources, and also sync BUILD.gn with the latest gyp.

BUG=angle:773

Change-Id: I212284cfa90cd117a784a5f17057f47dd08900d1
Reviewed-on: https://chromium-review.googlesource.com/239193
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2015-01-09 15:54:02 +00:00
Geoff Lang e7c6e43c2c Implement all entry points in libGLES and have libEGL act as a shim.
This allows libANGLE to only be included in libGLESv2 and moves all TLS
data to libGLESv2.dll.

BUG=angle:733

Change-Id: I34f0b47987a5efbe906c290d3ca656142e69ea9a
Reviewed-on: https://chromium-review.googlesource.com/232962
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-12-05 16:11:01 +00:00
Geoff Lang 9d9132dff2 Remove support for compiling libANGLE as a dynamic library.
BUG=angle:733

Change-Id: Iacef45b89f234091eb5df505437adabece1e564b
Reviewed-on: https://chromium-review.googlesource.com/232961
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-12-04 15:04:25 +00:00
Geoff Lang 8bc361e144 Support compiling libANGLE as a static or shared library.
BUG=angle:733

Change-Id: If27d3330534bce0f5b691010ea7d97bcb7579122
Reviewed-on: https://chromium-review.googlesource.com/231052
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-12-01 19:01:02 +00:00
Geoff Lang 2207213ba5 Move as many files as possible from common to libANGLE.
BUG=angle:733

Change-Id: If01c91cd52ac5c2102276a9fdc4b68ebc13e47f9
Reviewed-on: https://chromium-review.googlesource.com/231850
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-11-25 16:20:33 +00:00
Geoff Lang 4349ab855d Revert "Move as many files as possible from common to libANGLE."
Chromium directly includes our common/version.h and couldn't build after this change.

This reverts commit f0a2c7727f.

Change-Id: Iafc41b1a3973f609518fe3588fdb64cecc285332
Reviewed-on: https://chromium-review.googlesource.com/231840
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-11-25 15:53:46 +00:00
Geoff Lang f0a2c7727f Move as many files as possible from common to libANGLE.
BUG=angle:733

Change-Id: I40cee6e2e305ac493acbc8649f858785c0569aed
Reviewed-on: https://chromium-review.googlesource.com/231051
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-11-25 15:29:02 +00:00
Geoff Lang 2b5420c07f Merge libGLESv2 and libEGL classes into libANGLE.
BUG=angle:733

Change-Id: Ic491c971411fe82c56cd97c5c8325ac14ec218df
Reviewed-on: https://chromium-review.googlesource.com/230830
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-11-21 19:46:02 +00:00
John Abd-El-Malek ea0c84d177 Copy the D3D compiler dll in the GN build.
Change-Id: I773a411d07991d9ae160267eba8325c327146554
Reviewed-on: https://chromium-review.googlesource.com/229007
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: John Abd-El-Malek <jam@chromium.org>
2014-11-17 22:10:56 +00:00
Scott Graham 7e81c9d5fb Revert "Revert "Switch to 8.1 SDK and d3dcompiler_47.dll""
This reverts commit 3cbdc34d4e.

This reverts back to using 8.1 and d3dcompiler_47, as chrome is now rolled forward.

Change-Id: I7ef4ebdbc32146b9ba6f551e376ac03ac71131ba
Reviewed-on: https://chromium-review.googlesource.com/229990
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
Tested-by: Scott Graham <scottmg@chromium.org>
2014-11-15 05:18:59 +00:00
Scott Graham 3cbdc34d4e Revert "Switch to 8.1 SDK and d3dcompiler_47.dll"
This reverts commit e1425d95ba.

This is to keep the GPU fyi bots green until the chrome side is landed. Chrome will be rolling to e1425d95...

Change-Id: Iff1c60eeb7143fb72afa8525b31f8f0de9385897
Reviewed-on: https://chromium-review.googlesource.com/229497
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2014-11-14 18:27:07 +00:00
Scott Graham e1425d95ba Switch to 8.1 SDK and d3dcompiler_47.dll
Change-Id: If43c7861ab7f47448fd726fd0b5c35f3a6eeb362
Reviewed-on: https://chromium-review.googlesource.com/229616
Commit-Queue: Scott Graham <scottmg@chromium.org>
Tested-by: Scott Graham <scottmg@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-11-14 17:21:29 +00:00
John Abd-El-Malek 657cd684a6 Fixes for Angle to build with Windows GN.
Change-Id: Id38c4b11dba31b2779efa7beade481cd50f3d935
Reviewed-on: https://chromium-review.googlesource.com/227692
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
2014-11-05 22:36:58 +00:00
John Abd-El-Malek 330f0adedd Fixes for Angle to build with Windows GN.
Change-Id: I5af7a1305e5a190de5367ad940186edd6baee5bc
Reviewed-on: https://chromium-review.googlesource.com/227665
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-11-05 22:07:42 +00:00
Tibor den Ouden 97049c6a68 Enhance shader debug output
glGetTranslatedShaderSourceANGLE() returns the glsl code, the initial translated hlsl code,
the final translated hlsl code and the disassembly of the generated binary with the compiler configuration.
This enhancement is only available if the define ANGLE_GENERATE_SHADER_DEBUG_INFO exists.
This define is set in the debug configurations for the Windows platform.

BUG=angle:751

Change-Id: I8b15e8b25fbb0c0575a73cc876bf8f1fa7ed142a
Reviewed-on: https://chromium-review.googlesource.com/221059
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-10-17 16:41:42 +00:00
Kenneth Russell 1ce845d796 Refactor libGLESv2.gypi to allow libANGLE to be built on all platforms.
Required pulling angle_enable_d3d{9,11} into angle.gypi and definition
of angle_libangle_win_sources. Pull in those sources in BUILD.gn.

Tested with local GYP build on Windows. Did not test GN build yet.

BUG=angleproject:773

Change-Id: Ia3703fe4fa2bc8a1682c1fa1667ca36268b36cc7
Reviewed-on: https://chromium-review.googlesource.com/221785
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Kenneth Russell <kbr@chromium.org>
2014-10-08 21:28:20 +00:00
Brett Wilson 10ac404330 Rename GN public variables.
forward_dependent_configs_from => public_deps
direct_dependent_configs => public_configs

Change-Id: I93beca2109181a2aac8d5793c3464b3af8b6ab9b
Reviewed-on: https://chromium-review.googlesource.com/219695
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Brett Wilson <brettw@chromium.org>
2014-09-24 18:57:25 +00:00
Cem Kocagil f8a16d7b9d gn: Fix source paths
Change-Id: Idf0c746d7e4e9f03b176744e8ff027be2d5f25ad
Reviewed-on: https://chromium-review.googlesource.com/218520
Reviewed-by: Brett Wilson <brettw@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Commit-Queue: Cem Kocagil <ckocagil@chromium.org>
Tested-by: Cem Kocagil <ckocagil@chromium.org>
2014-09-16 19:50:12 +00:00
Jamie Madill 04994ec4b2 Use libANGLE to reduce duplicated ANGLE source compiles.
libGLESv2_static and libGLESv2 can re-use the same object files.

BUG=angle:733

Change-Id: I894f4b5b6fbc1fc47812609d9e996691daf9f318
Reviewed-on: https://chromium-review.googlesource.com/214188
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-09-03 21:02:31 +00:00
Jamie Madill e5c97abd32 Fix GN build with missing ShaderVars.cpp.
Change-Id: I29be6cdda643f83a40a6adc9b76153667aafcc51
Reviewed-on: https://chromium-review.googlesource.com/211400
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
2014-08-07 19:14:29 +00:00
Jamie Madill a2ad4e8a3e Export shader variables from the translator DLL.
This will allow us to use these methods when compiling the translator
as a DLL.

BUG=angle:466,697

Change-Id: Ic9169fb7c69fe0bf5f98addfc128a30ee6b2159d
Reviewed-on: https://chromium-review.googlesource.com/208752
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
2014-08-06 20:13:53 +00:00
Jamie Madill 7bf0c8670a Fix GN build for libEGL.
Our build in GN differed slightly from our gyp build, causing the
linker to complain about inconsistent linkage. Also remove some
stray definitions of EGLAPI from our headers.

Change-Id: I5d3a09ccb0cec528ead33944ce0996cceed32d86
Reviewed-on: https://chromium-review.googlesource.com/210821
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-08-01 14:14:47 +00:00
Jamie Madill 58c55c1373 Fix GN build for libGLESv2.dll.
In a previous fix to a Clang build error, we had neglected to update
the GN build. Broken in commit 07d49ef535.

BUG=angle:707

Change-Id: Ic11aa907d591540e915bec60f3bafaea471689d5
Reviewed-on: https://chromium-review.googlesource.com/210652
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Brett Wilson <brettw@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
2014-07-31 21:57:54 +00:00
Brett Wilson 2f5469c2d6 Export include directories to dependents in GN.
Translator headers that are included by dependent code
(example: ShaderLang.h) expect to be able to include files from
"includes" (example: "KHR/khrplatform.h"). This automatically
applies this include path to dependent targets.

Change-Id: I6990f66132562f142a6cdf8b8c434d2dbaad1c98
Reviewed-on: https://chromium-review.googlesource.com/209452
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Brett Wilson <brettw@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
2014-07-24 17:23:09 +00:00
Brett Wilson 04bac60c69 Explicitly list files for the build.
Removes shelling out to enumerate_files for the main targets (tests
and examples are currently unchanged) in favor of explicitly listing
out the files in the build.

There are a number of reasons. My immediate reason is that doing this
allows the file lists to be shared with the GN build so the GYP and GN
builds of angle should mostly automatically stay in sync now. In
addition, I don't think we should be enumerating files in GYP. No
other Chrome sub-projects do this, and Chrome engineers expect files
to be listed in .gyp* files. It's also slower to shell out a bunch of
times to get the file lists (this matters more in the GN build which
runs very quickly).

Updates the GN build to share these file lists. This unbreaks the
Windows GN Angle build.

BUG=angle:698

Change-Id: Iab8829628aeb7232bb64f4c247c35c6485bba3ee
Reviewed-on: https://chromium-review.googlesource.com/208461
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Brett Wilson <brettw@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
2014-07-17 21:21:50 +00:00
Brandon Jones f47bebc401 Refactored Texture2D, separated out D3D logic
BUG=angle:688
Change-Id: I93c2ff0b125278234d61324844b79cc58135d4d8
Reviewed-on: https://chromium-review.googlesource.com/207675
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Brandon Jones <bajones@chromium.org>
2014-07-15 21:05:23 +00:00
Shannon Woods 53a94a8238 Refactors State to be a fully-qualified class
BUG=angle:685

Change-Id: I36cff2da985a12c7180fe2850ccd471f4cebbaad
Reviewed-on: https://chromium-review.googlesource.com/206634
Tested-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
2014-07-15 16:43:33 +00:00
Brandon Jones 6518fe2466 Moved TextureStorage and Image into d3d
BUG=angle:688
Change-Id: I98ffa1082340a829a77fe5082958898b9c6ab1a2
Reviewed-on: https://chromium-review.googlesource.com/207054
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Brandon Jones <bajones@chromium.org>
2014-07-14 22:00:51 +00:00
Geoff Lang 57f9b6d56b Clean up generatemip.h.
* Move "private" functions into generatemip.inl.
* Use size_t for all dimensions.
* Use uint8_t pointers instead of unsigned char pointers.

BUG=angle:666

Change-Id: I8a1324802e4d670c042e0961c2b6f6fd53f4ebc7
Reviewed-on: https://chromium-review.googlesource.com/202503
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-07-11 20:21:54 +00:00
Geoff Lang 86846e242e Clean up the functions in loadimage.h/cpp.
* Capitalize the function names to fit the style guide.
* Use explicit sizes in the function names to avoid any confusion about
  input or output sizes.
* Use explicit sized types in the functions to avoid potential issues on
  new platforms since a lot of bit-twiddling is used.
* Use size_t for all sizes.
* Use uint8_t for all binary data for input and output data so that pointer
  arithmetic is much easier.
* Move templated function definitions into an .inl file so that
  loadimage.h looks as clean as possible.

BUG=angle:665

Change-Id: Id7173ed66d9e1b7ee3261eea11e77d838cbd2951
Reviewed-on: https://chromium-review.googlesource.com/202590
Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
2014-07-11 20:21:35 +00:00
Jamie Madill 72f5b5eee7 Add the BUILD.gn file to the ANGLE source.
The script currently lives in Chromium's build/secondary.

BUG=angle:683

Change-Id: I3ce11913fd27e0a01a1763d6ed973b250cf101d8
Reviewed-on: https://chromium-review.googlesource.com/205244
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
2014-06-26 14:36:51 +00:00