Skip to content

A
angle
Switch branch/tag
  1. 25 May, 2015 11 commits
  3. 22 May, 2015 17 commits
  5. 21 May, 2015 11 commits
    • Fix warning in string_utils.cpp in Win32 · 7467b2b1
      Corentin Wallez authored 
      BUG=

Change-Id: Ibb25d46c2ee5f361f6a948dc3efea38422a4573f
Reviewed-on: https://chromium-review.googlesource.com/272559Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
    • Fix -Winconsistent-override in Mock classes · 2f9455e3
      Corentin Wallez authored 
      Gmock defines virtual functions without the override keyword so the
constructors using override here caused a warning.

BUG=angleproject:892

Change-Id: I2a8f0445aa4a1e09694b7f98a6da07f8abaa47fb
Reviewed-on: https://chromium-review.googlesource.com/272551Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
    • Revert "Revert "Call XSync in the GLX EGL impl if we have a new X server connection"" · f68fd9c4
      Corentin Wallez authored 
      This reverts commit 9c0a4218.

Change-Id: Ia543daebc240b81950e21930895a7e24ed9f7a1b
Reviewed-on: https://chromium-review.googlesource.com/272225Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org>
    • Add some string helper classes. · 8c5aeb6c
      Jamie Madill authored 
      *re-land with build fix for Clang*

These helper functions mirror some utilities in Chrome, for splitting
strings along whitespace, or reading file contents into a string.

Also remove the hack for skipping the doubly-defined GLX header.

BUG=angleproject:892,angleproject:998

Change-Id: Ife43fbf5035a3be7820460bea1b26d0e632a4fb0
Reviewed-on: https://chromium-review.googlesource.com/272518Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
    • Handle compressed texture formats in the emulated TextureStorage for TextureGL. · 42c98f6b
      Geoff Lang authored 
      BUG=angleproject:884

Change-Id: Id54d9ff2845af52807161e0b589d8b76cfba412d
Reviewed-on: https://chromium-review.googlesource.com/272424Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org>
Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
    • Pipe the imageSize parameter from the entry point to avoid recomputation. · 8509d86e
      Geoff Lang authored 
      BUG=angleproject:884

Change-Id: Ic4d5bdc5b65ebcb8c57b960e84708e945db0276a
Reviewed-on: https://chromium-review.googlesource.com/272422Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org>
Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
    • Revert "Add some string helper classes." · a30c78ae
      Jamie Madill authored 
      Build errors on Clang:

FAILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/third_party/angle/src/common/angle_common.string_utils.o.d -DV8_DEPRECATION_WARNINGS -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=233105-2 -DTOOLKIT_VIEWS=1 -DUSE_LIBJPEG_TURBO=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_PRE_SYNC_BACKUP -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DUSE_PROPRIETARY_CODECS -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE -DDONT_EMBED_BUILD_METADATA -DDCHECK_ALWAYS_ON=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DENABLE_WIFI_BOOTSTRAPPING=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DSAFE_BROWSING_SERVICE -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -Igen -I../../third_party/angle/src -I../../third_party/angle/include -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -O2 -gdwarf-2 -fvisibility=hidden -Werror -Wnewline-eof -mmacosx-version-min=10.6 -arch x86_64 -Wendif-labels -Wno-unused-parameter -Wno-missing-field-initializers -Wno-selector-type-mismatch -Wpartial-availability -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -std=c++11 -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -Xclang -load -Xclang /b/build/slave/GPU_Mac_Builder/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -fcolor-diagnostics -fno-strict-aliasing  -c ../../third_party/angle/src/common/string_utils.cpp -o obj/third_party/angle/src/common/angle_common.string_utils.o
../../third_party/angle/src/common/string_utils.cpp:72:19: error: no matching constructor for initialization of 'std::ifstream' (aka 'basic_ifstream<char>')
    std::ifstream inFile(path);
                  ^      ~~~~
/Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/c++/4.2.1/fstream:465:7: note: candidate constructor not viable: no known conversion from 'const std::string' (aka 'const basic_string<char>') to 'const char *' for 1st argument
      basic_ifstream(const char* __s, ios_base::openmode __mode = ios_base::in)
      ^
/Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/c++/4.2.1/bits/fstream.tcc:894:25: note: candidate constructor (the implicit copy constructor) not viable: no known conversion from 'const std::string' (aka 'const basic_string<char>') to 'const std::basic_ifstream<char>' for 1st argument
  extern template class basic_ifstream<char>;
                        ^
/Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/c++/4.2.1/fstream:451:7: note: candidate constructor not viable: requires 0 arguments, but 1 was provided
      basic_ifstream() : __istream_type(), _M_filebuf()
      ^
1 error generated.
FAILED: /b/build/goma/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/third_party/angle/src/common/angle_unittests.string_utils_unittest.o.d -DV8_DEPRECATION_WARNINGS -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DCHROMIUM_BUILD -DCR_CLANG_REVISION=233105-2 -DTOOLKIT_VIEWS=1 -DUSE_LIBJPEG_TURBO=1 -DENABLE_ONE_CLICK_SIGNIN -DENABLE_PRE_SYNC_BACKUP -DENABLE_REMOTING=1 -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DUSE_PROPRIETARY_CODECS -DENABLE_PEPPER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DENABLE_HIDPI=1 -DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE -DDONT_EMBED_BUILD_METADATA -DDCHECK_ALWAYS_ON=1 -DENABLE_TASK_MANAGER=1 -DENABLE_EXTENSIONS=1 -DENABLE_PLUGIN_INSTALLATION=1 -DENABLE_PLUGINS=1 -DENABLE_SESSION_SERVICE=1 -DENABLE_THEMES=1 -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_BACKGROUND=1 -DENABLE_GOOGLE_NOW=1 -DCLD_VERSION=2 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_PRINT_PREVIEW=1 -DENABLE_SPELLCHECK=1 -DENABLE_CAPTIVE_PORTAL_DETECTION=1 -DENABLE_APP_LIST=1 -DENABLE_SETTINGS_APP=1 -DENABLE_SUPERVISED_USERS=1 -DENABLE_SERVICE_DISCOVERY=1 -DENABLE_WIFI_BOOTSTRAPPING=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DSAFE_BROWSING_SERVICE -DGTEST_HAS_POSIX_RE=0 -DGTEST_LANG_CXX11=0 -DGL_APICALL= -DGL_GLEXT_PROTOTYPES= -DEGLAPI= '-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_47.dll", "d3dcompiler_46.dll", "d3dcompiler_43.dll" }' -DANGLE_TRANSLATOR_STATIC -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -D_FORTIFY_SOURCE=2 -Igen -I../.. -I../../third_party/angle/include -I../../third_party/angle/src -I../../third_party/angle/src/compiler/preprocessor -I../../third_party/angle/src/tests -Igen/angle -I../../testing/gmock/include -I../../testing/gtest/include -isysroot /Applications/Xcode5.1.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -O2 -gdwarf-2 -fvisibility=hidden -Werror -Wnewline-eof -mmacosx-version-min=10.6 -arch x86_64 -Wall -Wendif-labels -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-selector-type-mismatch -Wpartial-availability -Wheader-hygiene -Wno-char-subscripts -Wno-unneeded-internal-declaration -Wno-covered-switch-default -Wstring-conversion -Wno-c++11-narrowing -Wno-deprecated-register -Wno-inconsistent-missing-override -std=c++11 -fno-rtti -fno-exceptions -fvisibility-inlines-hidden -fno-threadsafe-statics -Xclang -load -Xclang /b/build/slave/GPU_Mac_Builder/build/src/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib -Xclang -add-plugin -Xclang find-bad-constructs -fcolor-diagnostics -fno-strict-aliasing  -c ../../third_party/angle/src/common/string_utils_unittest.cpp -o obj/third_party/angle/src/common/angle_unittests.string_utils_unittest.o
In file included from ../../third_party/angle/src/common/string_utils_unittest.cpp:12:
../../testing/gtest/include/gtest/gtest.h:1481:16: error: comparison of integers of different signs: 'const int' and 'const unsigned int' [-Werror,-Wsign-compare]
  if (expected == actual) {
      ~~~~~~~~ ^  ~~~~~~
../../testing/gtest/include/gtest/gtest.h:1511:12: note: in instantiation of function template specialization 'testing::internal::CmpHelperEQ<int, unsigned int>' requested here
    return CmpHelperEQ(expected_expression, actual_expression, expected,
           ^
../../third_party/angle/src/common/string_utils_unittest.cpp:55:5: note: in instantiation of function template specialization 'testing::internal::EqHelper<false>::Compare<int, unsigned int>' requested here
    EXPECT_EQ(0xBADF00D, uintValue);
    ^
../../testing/gtest/include/gtest/gtest.h:2017:67: note: expanded from macro 'EXPECT_EQ'
                      EqHelper<GTEST_IS_NULL_LITERAL_(expected)>::Compare, \
                                                                  ^
../../testing/gtest/include/gtest/gtest_pred_impl.h:162:23: note: expanded from macro 'EXPECT_PRED_FORMAT2'
  GTEST_PRED_FORMAT2_(pred_format, v1, v2, GTEST_NONFATAL_FAILURE_)
                      ^
../../testing/gtest/include/gtest/gtest_pred_impl.h:147:17: note: expanded from macro 'GTEST_PRED_FORMAT2_'
  GTEST_ASSERT_(pred_format(#v1, #v2, v1, v2), \
                ^
../../testing/gtest/include/gtest/gtest_pred_impl.h:77:52: note: expanded from macro 'GTEST_ASSERT_'
  if (const ::testing::AssertionResult gtest_ar = (expression)) \
                                                   ^
BUG=angleproject:892,angleproject:998

This reverts commit fa5fb6f1.

Change-Id: I949debbd365926301ec19225f262484fa3b8e13b
Reviewed-on: https://chromium-review.googlesource.com/272548Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
    • Add some string helper classes. · fa5fb6f1
      Jamie Madill authored 
      These helper functions mirror some utilities in Chrome, for splitting
strings along whitespace, or reading file contents into a string.

Also remove the hack for skipping the doubly-defined GLX header.

BUG=angleproject:892,angleproject:998

Change-Id: Ie617be7e02c2ccc684028500aabb54561c9c6c14
Reviewed-on: https://chromium-review.googlesource.com/272436Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org>
Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
    • Revert "In D3D11 with DXGI1.2, use B5G6R5 for GL_RGB565" · b106fac5
      Jamie Madill authored 
      Causing a failure in the end2end_test (in Debug):

ClearTest.ClearIssue/1

Renderer11::createRenderTarget returns unsupported when trying to create a BGR565 texture.

BUG=angleproject:1002

This reverts commit 72a31d66.

Change-Id: I9e052c78517abbcb22a678a949fdb81d6ba67eb7
Reviewed-on: https://chromium-review.googlesource.com/272543Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
    • In D3D11 with DXGI1.2, use B5G6R5 for GL_RGB565 · 72a31d66
      Austin Kinross authored 
      *re-land with build fix*

BUG=angleproject:1002

Change-Id: Ic1d8ea23dc1bf56e713e5d991ab9edd48978d3d7
Reviewed-on: https://chromium-review.googlesource.com/272515Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
    • Revert "In D3D11 with DXGI1.2, use B5G6R5 for GL_RGB565" · a86a607f
      Jamie Madill authored 
      Build break on Windows due to a rebase conflict (relocated header)

24>..\..\src\tests\gl_tests\SixteenBppTextureTest.cpp(9): fatal error C1083: Cannot open include file: 'end2end_tests/ANGLETest.h': No such file or directory

BUG=angleproject:1002
This reverts commit 5224926d.

Change-Id: I4ed4e918ca5bcd85367ed3e364e29039fcdf5619
Reviewed-on: https://chromium-review.googlesource.com/272542Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
  7. 20 May, 2015 1 commit