Remove gl_context_glx_override.cc

Not needed after switching of desktop to GLES2.

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=5599

Change-Id: Idba614df3c96ca5160a5e97280b37afc175f9fc9
Signed-off-by: Viatcheslav Ostapenko <sl.ostapenko@samsung.com>

diff --git a/tizen_src/impl/chromium-efl.gyp b/tizen_src/impl/chromium-efl.gyp
index 5e0fdd1ce9b8cfe2286d63fcc2e9da4e17a6cd77..dd0ad64c442a961e5de02471516541a902e285ca 100644 (file)
--- a/tizen_src/impl/chromium-efl.gyp
+++ b/tizen_src/impl/chromium-efl.gyp
@@ -232,7 +232,6 @@
       'gfx/x11_event_source_efl.cc',
       'gfx/x11_types_override.cc',
       'gl/gl_context_egl_override.cc',
-      'gl/gl_context_glx_override.cc',
       'gl/gl_current_context_efl.cc',
       'gl/gl_shared_context_efl.cc',
       'gl/gl_shared_context_efl.h',

diff --git a/tizen_src/impl/chromium-efl.gypi b/tizen_src/impl/chromium-efl.gypi
index be5aebd1ae479c0f3a62ef5d876e781a9d6f8c94..613164ca8839f6aa811b15bd03f0d252ad4e1507 100644 (file)
--- a/tizen_src/impl/chromium-efl.gypi
+++ b/tizen_src/impl/chromium-efl.gypi
@@ -28,7 +28,6 @@
       ['exclude', 'browser/web_contents/web_contents_view_aura\\.cc$'],
       ['exclude', 'clipboard/clipboard_aurax11\\.cc$'],
       ['exclude', 'gl_context_egl\\.cc$'],
-      ['exclude', 'gl_context_glx\\.cc$'],
       ['exclude', 'x11_event_source_glib\\.cc$'],
       ['exclude', 'x11_event_source_libevent\\.cc$'],
       ['exclude', 'x11_types\\.cc$'],

diff --git a/tizen_src/impl/gl/gl_context_glx_override.cc b/tizen_src/impl/gl/gl_context_glx_override.cc
deleted file mode 100644 (file)
index c747223..0000000
--- a/tizen_src/impl/gl/gl_context_glx_override.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-   Copyright (C) 2014 Samsung Electronics
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-// Define GLContextGLX to GLContextGLXOverride to be able to replace
-// initialize method in GLContextGLX
-#define GLContextGLX GLContextGLXOverride
-
-#define private public
-
-#include "ui/gl/gl_context_glx.cc"
-
-#undef GLContextGLX
-
-namespace gfx {
-
-struct GL_EXPORT GLContextGLX : public GLContextGLXOverride {
-  GLContextGLX(GLShareGroup* share_group);
-
-  bool Initialize(
-      GLSurface* compatible_surface, GpuPreference gpu_preference);
-};
-
-GLContextGLX::GLContextGLX(GLShareGroup* share_group) :
-    GLContextGLXOverride(share_group) {
-}
-
-bool GLContextGLX::Initialize(
-    GLSurface* compatible_surface, GpuPreference gpu_preference) {
-  display_ = static_cast<XDisplay*>(compatible_surface->GetDisplay());
-
-  GLXContext share_handle = static_cast<GLXContext>(
-      share_group() ? share_group()->GetHandle() : NULL);
-
-  context_ = glXCreateNewContext(
-     display_,
-     static_cast<GLXFBConfig>(compatible_surface->GetConfig()),
-     GLX_RGBA_TYPE,
-     share_handle,
-     True);
-  if (!context_) {
-    LOG(ERROR) << "Failed to create GL context with glXCreateNewContext.";
-    return false;
-  }
-
-  DCHECK(context_);
-  DVLOG(1) << "  Successfully allocated "
-           << (compatible_surface->IsOffscreen() ?
-               "offscreen" : "onscreen")
-           << " GL context with LOSE_CONTEXT_ON_RESET_ARB";
-
-  DVLOG(1) << (compatible_surface->IsOffscreen() ? "Offscreen" : "Onscreen")
-           << " context was "
-           << (glXIsDirect(display_,
-                           static_cast<GLXContext>(context_))
-                   ? "direct" : "indirect")
-           << ".";
-
-  return true;
-}
-
-}
-