← Back to branch summary

~justinmcp/oxide/mediahub-fixes-1.9

« back to all changes in this revision

Viewing changes to patches/port/gl_implementation.patch

  • Committer: Chris Coulson
  • Date: 2015-07-16 10:09:46 UTC
  • mfrom: (640.1.329 canary)
  • Revision ID: chris.coulson@canonical.com-20150716100946-k9707yx7xquf14ks
Bump Chromium rev to 45.0.2454.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/port/gl_implementation.patch
47
47
     {
48
48
       'target_name': 'gfx',
49
49
       'type': '<(component)',
50
 
@@ -402,17 +404,17 @@
51
 
             'harfbuzz_font_skia.h',
52
 
             'render_text.cc',
53
 
             'render_text.h',
54
 
             'render_text_harfbuzz.cc',
55
 
             'render_text_harfbuzz.h',
56
 
             'text_utils_skia.cc',
 
50
@@ -437,17 +439,17 @@
 
51
                           '--working_directory=vector_icons/',
 
52
                           '--output_cc=<(vector_icons_cc_file)',
 
53
                           '--output_h=<(vector_icons_public_h_file)',
 
54
               ],
 
55
               'message': 'Aggregating vector resources.',
 
56
             },
57
57
           ],
58
58
         }],
59
59
-        ['use_x11==1', {
215
215
 #endif
216
216
 
217
217
 #if defined(OS_WIN) || defined(USE_X11) || defined(OS_ANDROID) || defined(USE_OZONE)
218
 
@@ -54,17 +54,17 @@ std::string DriverEGL::GetPlatformExtens
 
218
@@ -47,16 +47,16 @@ std::string DriverEGL::GetPlatformExtens
 
219
 
 
220
 // static
219
221
 std::string DriverEGL::GetClientExtensions() {
220
 
   DCHECK(g_driver_egl.fn.eglQueryStringFn);
221
 
   const char* str =
222
 
       g_driver_egl.fn.eglQueryStringFn(EGL_NO_DISPLAY, EGL_EXTENSIONS);
 
222
   const char* str = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
223
223
   return str ? std::string(str) : "";
224
224
 }
225
225
 #endif
227
227
-#if defined(USE_X11)
228
228
+#if defined(OS_LINUX)
229
229
 std::string DriverGLX::GetPlatformExtensions() {
230
 
   DCHECK(g_driver_glx.fn.glXQueryExtensionsStringFn);
231
 
   const char* str =
232
 
       g_driver_glx.fn.glXQueryExtensionsStringFn(gfx::GetXDisplay(), 0);
 
230
   const char* str = glXQueryExtensionsString(gfx::GetXDisplay(), 0);
233
231
   return str ? std::string(str) : "";
234
232
 }
235
233
 #endif
236
234
 
 
235
 }  // namespace gfx
237
236
diff --git a/ui/gl/gl_bindings.h b/ui/gl/gl_bindings.h
238
237
--- a/ui/gl/gl_bindings.h
239
238
+++ b/ui/gl/gl_bindings.h
256
255
 #undef Bool
257
256
 #undef None
258
257
 #undef Status
259
 
@@ -317,16 +317,19 @@ typedef uint64 EGLuint64CHROMIUM;
 
258
@@ -312,16 +312,19 @@ typedef uint64 EGLuint64CHROMIUM;
260
259
 #if defined(OS_WIN)
261
260
 #include "gl_bindings_autogen_egl.h"
262
261
 #include "gl_bindings_autogen_wgl.h"
276
275
 
277
276
 struct GL_EXPORT DriverGL {
278
277
   void InitializeStaticBindings();
279
 
@@ -386,17 +389,17 @@ struct GL_EXPORT DriverEGL {
 
278
@@ -384,17 +387,17 @@ struct GL_EXPORT DriverEGL {
280
279
   ProcsEGL debug_fn;
281
280
   ExtensionsEGL ext;
282
281
 
289
288
+#if defined(OS_LINUX)
290
289
 struct GL_EXPORT DriverGLX {
291
290
   void InitializeStaticBindings();
 
291
   void InitializeExtensionBindings();
292
292
   void InitializeDebugBindings();
293
293
   void ClearBindings();
294
294
 
295
295
   ProcsGLX fn;
296
296
   ProcsGLX debug_fn;
297
 
   ExtensionsGLX ext;
298
 
@@ -428,16 +431,23 @@ GL_EXPORT extern GLXApi* g_current_glx_c
 
297
@@ -427,16 +430,23 @@ GL_EXPORT extern GLXApi* g_current_glx_c
299
298
 GL_EXPORT extern DriverEGL g_driver_egl;
300
299
 GL_EXPORT extern DriverGLX g_driver_glx;
301
300
 
322
321
diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc
323
322
--- a/ui/gl/gl_implementation.cc
324
323
+++ b/ui/gl/gl_implementation.cc
325
 
@@ -59,16 +59,19 @@ WGLApi* g_current_wgl_context;
 
324
@@ -61,16 +61,19 @@ WGLApi* g_current_wgl_context;
326
325
 #elif defined(USE_X11)
327
326
 
328
327
 EGLApi* g_current_egl_context;