summaryrefslogtreecommitdiffstats
path: root/gpu/gles2_conform_support
diff options
context:
space:
mode:
authordewittj <dewittj@chromium.org>2015-08-28 15:56:17 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-28 22:56:50 +0000
commitacd39a01d79146935afc78a0ae5421146253f5e6 (patch)
tree8313d779ef9d38b93977e313b7897da40bb3ddfa /gpu/gles2_conform_support
parentdb5883e4d868e55ff9123064d3c0e5ea4c11aa05 (diff)
downloadchromium_src-acd39a01d79146935afc78a0ae5421146253f5e6.zip
chromium_src-acd39a01d79146935afc78a0ae5421146253f5e6.tar.gz
chromium_src-acd39a01d79146935afc78a0ae5421146253f5e6.tar.bz2
Revert of Add command_buffer_gles2 (patchset #6 id:160001 of https://codereview.chromium.org/1220883008/ )
Reason for revert: Compile failure: FAILED: /b/build/goma/gomacc /b/build/slave/Android_Debug__Nexus_6_/build/src/third_party/android_tools/ndk//toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -MMD -MF obj/gpu/command_buffer_gles2/command_buffer_gles2.command_buffer_egl.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=1 -D_FILE_OFFSET_BITS=64 -DNO_TCMALLOC -DDISABLE_NACL -DCHROMIUM_BUILD -DCR_CLANG_REVISION=245965-1 -DUSE_LIBJPEG_TURBO=1 -DENABLE_WEBRTC=1 -DENABLE_MEDIA_ROUTER=1 -DUSE_PROPRIETARY_CODECS -DENABLE_BROWSER_CDMS -DENABLE_CONFIGURATION_POLICY -DENABLE_NOTIFICATIONS -DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE -DDONT_EMBED_BUILD_METADATA -DFIELDTRIAL_TESTING_ENABLED -DENABLE_AUTOFILL_DIALOG=1 -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DENABLE_SPELLCHECK=1 -DUSE_BROWSER_SPELLCHECKER=1 -DENABLE_SUPERVISED_USERS=1 -DVIDEO_HOLE=1 -DV8_USE_EXTERNAL_STARTUP_DATA -DENABLE_WEBVR -DMOBILE_SAFE_BROWSING -DSAFE_BROWSING_DB_REMOTE -DSAFE_BROWSING_SERVICE -DEGLAPI= -DEGLAPIENTRY= -DMESA_EGL_NO_X11_HEADERS -DUSE_LIBPCI=1 -DUSE_OPENSSL=1 -DUSE_OPENSSL_CERTS=1 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DANDROID -D__GNU_SOURCE=1 '-DCHROME_BUILD_ID=""' -DHAVE_SYS_UIO_H -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_DEBUG -Igen -I../../third_party/khronos -I../../gpu -I../.. -I../../skia/config -Igen/angle -I../../third_party/mesa/src/include -fstack-protector --param=ssp-buffer-size=4 -Werror -fno-strict-aliasing -Wall -Wno-unused-parameter -Wno-missing-field-initializers -fvisibility=hidden -pipe -fPIC -Wno-unused-local-typedefs -march=armv7-a -mtune=generic-armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp -mthumb -fno-tree-sra -fno-caller-saves -Wno-psabi -mthumb-interwork -ffunction-sections -funwind-tables -g -fstack-protector -fno-short-enums -finline-limit=64 --sysroot=../../third_party/android_tools/ndk//platforms/android-16/arch-arm -isystem../../third_party/android_tools/ndk//sources/cxx-stl/llvm-libc++/libcxx/include -isystem../../third_party/android_tools/ndk//sources/cxx-stl/llvm-libc++abi/libcxxabi/include -isystem../../third_party/android_tools/ndk//sources/android/support/include -Os -g -fdata-sections -ffunction-sections -fomit-frame-pointer -funwind-tables -g0 -fno-exceptions -fno-rtti -fno-threadsafe-statics -fvisibility-inlines-hidden -Wsign-compare -Wno-abi -std=gnu++11 -Wno-narrowing -Wno-literal-suffix -c ../../gpu/command_buffer_gles2/command_buffer_egl.cc -o obj/gpu/command_buffer_gles2/command_buffer_gles2.command_buffer_egl.o ../../gpu/command_buffer_gles2/command_buffer_egl.cc:8:66: fatal error: gpu/command_buffer_gles2/command_buffer_gles2_export.h: No such file or directory #include "gpu/command_buffer_gles2/command_buffer_gles2_export.h" ^ https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%206%29/builds/2270 Original issue's description: > Add command_buffer_gles2 > > This is a very simple library that exposes some egl-like functions that > can be used by skia to use the command buffer as a backend for their > tests > > Committed: https://crrev.com/604b615373e4e9f873db37cef9c6416176fc35f3 > Cr-Commit-Position: refs/heads/master@{#346251} TBR=piman@chromium.org,dpranke@chromium.org,sievers@chromium.org,hendrikw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1320963003 Cr-Commit-Position: refs/heads/master@{#346258}
Diffstat (limited to 'gpu/gles2_conform_support')
-rw-r--r--gpu/gles2_conform_support/egl/egl.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/gpu/gles2_conform_support/egl/egl.cc b/gpu/gles2_conform_support/egl/egl.cc
index 41601da..343937f 100644
--- a/gpu/gles2_conform_support/egl/egl.cc
+++ b/gpu/gles2_conform_support/egl/egl.cc
@@ -102,16 +102,12 @@ EGLBoolean eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) {
if (!display->Initialize())
return EglError(EGL_NOT_INITIALIZED, EGL_FALSE);
- // eglInitialize can be called multiple times, prevent InitializeOneOff from
- // being called multiple times.
- if (gfx::GetGLImplementation() == gfx::kGLImplementationNone) {
- int argc = 1;
- const char* const argv[] = {
- "dummy"
- };
- base::CommandLine::Init(argc, argv);
- gfx::GLSurface::InitializeOneOff();
- }
+ int argc = 1;
+ const char* const argv[] = {
+ "dummy"
+ };
+ base::CommandLine::Init(argc, argv);
+ gfx::GLSurface::InitializeOneOff();
*major = 1;
*minor = 4;