diff options
| author | zmo <zmo@chromium.org> | 2016-02-25 11:24:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-25 19:26:48 +0000 |
| commit | 0df7774c8d57adb794693f98733c610715c0879c (patch) | |
| tree | b61b8920cb69cbb0301c8185f6670a5299930b66 /gpu/gpu.gyp | |
| parent | af0f476939fbbad4ed6c32548c974c55fe663900 (diff) | |
| download | chromium_src-0df7774c8d57adb794693f98733c610715c0879c.zip chromium_src-0df7774c8d57adb794693f98733c610715c0879c.tar.gz chromium_src-0df7774c8d57adb794693f98733c610715c0879c.tar.bz2 | |
Revert of command_buffer_gles2: Implement EGL default Display as a global object (patchset #8 id:140001 of https://codereview.chromium.org/1714883002/ )
Reason for revert:
Broke gles2_conform on mac/linux GPU bots on FYI waterfall
GTFNativeCreateWindow failed
Original issue's description:
> command_buffer_gles2: Implement EGL default Display as a global object
>
> Make EGL Display a global. eglGetDisplay(EGL_DEFAULT_DISPLAY) will
> return the same object.
>
> Store EGL state in a new thread-local object (ThreadState). One
> display, multiple surfaces, multiple contexts.
>
> Fix the currently implemented entry points to return specified errors
> and behave as specified. Notable changes:
> * eglGetDisplay() does not create new displays for each invocation
> * eglTerminate() invalidates the created egl objects but leaves the
> current context intact as specified
> * eglMakeCurrent() is implemented more correctly with refcount semantics
> * eglQueryStrings() works without display for some names
> * eglReleaseThread() is implemeted
> * Config are now separate for pbuffers and windows, so that contexts
> can be created separate from surfaces
> * Context can be made current with different surfaces
> * Catches errors related to context being set current to multiple
> threads
> * Tries to be thread-safe
>
> In the implementation, the Display contains a lock ensuring all thread
> accesses are consistent. All functions using or changing thread-local
> state have explicit egl::ThreadState parameter.
>
> BUG=581634
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel
>
> Committed: https://crrev.com/de9aa3be41bca094454babbd62907815fad7f5c2
> Cr-Commit-Position: refs/heads/master@{#377535}
TBR=piman@chromium.org,thakis@chromium.org,kkinnunen@nvidia.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=581634
Review URL: https://codereview.chromium.org/1739033002
Cr-Commit-Position: refs/heads/master@{#377641}
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 5f95bc5..2ad775d 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -427,7 +427,6 @@ '../gpu/gpu.gyp:command_buffer_service', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gl/gl.gyp:gl', - 'command_buffer/command_buffer.gyp:gles2_utils', 'gles2_c_lib', 'gles2_implementation', ], @@ -436,8 +435,6 @@ # TODO(hendrikw): Move egl out of gles2_conform_support. 'gles2_conform_support/egl/config.cc', 'gles2_conform_support/egl/config.h', - 'gles2_conform_support/egl/context.cc', - 'gles2_conform_support/egl/context.h', 'gles2_conform_support/egl/display.cc', 'gles2_conform_support/egl/display.h', 'gles2_conform_support/egl/egl.cc', @@ -445,8 +442,6 @@ 'gles2_conform_support/egl/surface.h', 'gles2_conform_support/egl/test_support.cc', 'gles2_conform_support/egl/test_support.h', - 'gles2_conform_support/egl/thread_state.cc', - 'gles2_conform_support/egl/thread_state.h', ], 'defines': [ 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', |