API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Mar 26th, 2019
118
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 19.36 KB | None | 0 0
raw download clone embed print report
  1. From 4eb4ea394f43a300251d3e5e561cad48db6d986c Mon Sep 17 00:00:00 2001
  2. From: test <test@test.test>
  3. Date: Tue, 4 Sep 2018 20:21:26 +0000
  4. Subject: [PATCH 1/1] mali drivers
  5.  
  6. ---
  7. src/backends/native/meta-crtc-kms.c | 14 -
  8. src/backends/native/meta-crtc-kms.h | 3 -
  9. .../native/meta-renderer-native-gles3.c | 112 +------
  10. src/backends/native/meta-renderer-native.c | 296 ++----------------
  11. src/backends/x11/meta-renderer-x11.c | 6 +-
  12. 5 files changed, 45 insertions(+), 386 deletions(-)
  13.  
  14. diff --git a/src/backends/native/meta-crtc-kms.c b/src/backends/native/meta-crtc-kms.c
  15. index 344c80a..8152991 100644
  16. --- a/src/backends/native/meta-crtc-kms.c
  17. +++ b/src/backends/native/meta-crtc-kms.c
  18. @@ -29,8 +29,6 @@
  19. #include "backends/meta-backend-private.h"
  20. #include "backends/native/meta-gpu-kms.h"
  21.  
  22. -#include <drm_fourcc.h>
  23. -
  24. #define ALL_TRANSFORMS (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)
  25. #define ALL_TRANSFORMS_MASK ((1 << ALL_TRANSFORMS) - 1)
  26.  
  27. @@ -176,18 +174,6 @@ find_property_index (MetaGpu *gpu,
  28. return -1;
  29. }
  30.  
  31. -GArray *
  32. -meta_crtc_kms_get_modifiers (MetaCrtc *crtc,
  33. - uint32_t format)
  34. -{
  35. - MetaCrtcKms *crtc_kms = crtc->driver_private;
  36. -
  37. - if (format != DRM_FORMAT_XRGB8888)
  38. - return NULL;
  39. -
  40. - return crtc_kms->modifiers_xrgb8888;
  41. -}
  42. -
  43. static inline uint32_t *
  44. formats_ptr (struct drm_format_modifier_blob *blob)
  45. {
  46. diff --git a/src/backends/native/meta-crtc-kms.h b/src/backends/native/meta-crtc-kms.h
  47. index 44899f6..cb275f4 100644
  48. --- a/src/backends/native/meta-crtc-kms.h
  49. +++ b/src/backends/native/meta-crtc-kms.h
  50. @@ -37,9 +37,6 @@ void meta_crtc_kms_apply_transform (MetaCrtc *crtc);
  51. void meta_crtc_kms_set_underscan (MetaCrtc *crtc,
  52. gboolean is_underscanning);
  53.  
  54. -GArray * meta_crtc_kms_get_modifiers (MetaCrtc *crtc,
  55. - uint32_t format);
  56. -
  57. MetaCrtc * meta_create_kms_crtc (MetaGpuKms *gpu_kms,
  58. drmModeCrtc *drm_crtc,
  59. unsigned int crtc_index);
  60. diff --git a/src/backends/native/meta-renderer-native-gles3.c b/src/backends/native/meta-renderer-native-gles3.c
  61. index dbc59b6..0914dfe 100644
  62. --- a/src/backends/native/meta-renderer-native-gles3.c
  63. +++ b/src/backends/native/meta-renderer-native-gles3.c
  64. @@ -26,13 +26,11 @@
  65.  
  66. #include "backends/native/meta-renderer-native-gles3.h"
  67.  
  68. -#include <drm_fourcc.h>
  69. #include <errno.h>
  70. #include <gio/gio.h>
  71. #include <GLES3/gl3.h>
  72. #include <string.h>
  73.  
  74. -#include "backends/meta-egl-ext.h"
  75. #include "backends/meta-gles3.h"
  76. #include "backends/meta-gles3-table.h"
  77.  
  78. @@ -50,92 +48,24 @@ create_egl_image (MetaEgl *egl,
  79. EGLContext egl_context,
  80. unsigned int width,
  81. unsigned int height,
  82. - uint32_t n_planes,
  83. - uint32_t *strides,
  84. - uint32_t *offsets,
  85. - uint64_t *modifiers,
  86. + uint32_t stride,
  87. uint32_t format,
  88. int fd,
  89. GError **error)
  90. {
  91. - EGLint attribs[37];
  92. - int atti = 0;
  93. - gboolean has_modifier;
  94. -
  95. - /* This requires the Mesa commit in
  96. - * Mesa 10.3 (08264e5dad4df448e7718e782ad9077902089a07) or
  97. - * Mesa 10.2.7 (55d28925e6109a4afd61f109e845a8a51bd17652).
  98. - * Otherwise Mesa closes the fd behind our back and re-importing
  99. - * will fail.
  100. - * https://bugs.freedesktop.org/show_bug.cgi?id=76188
  101. - */
  102. -
  103. - attribs[atti++] = EGL_WIDTH;
  104. - attribs[atti++] = width;
  105. - attribs[atti++] = EGL_HEIGHT;
  106. - attribs[atti++] = height;
  107. - attribs[atti++] = EGL_LINUX_DRM_FOURCC_EXT;
  108. - attribs[atti++] = format;
  109. -
  110. - has_modifier = (modifiers[0] != DRM_FORMAT_MOD_INVALID &&
  111. - modifiers[0] != DRM_FORMAT_MOD_LINEAR);
  112. -
  113. - if (n_planes > 0)
  114. - {
  115. - attribs[atti++] = EGL_DMA_BUF_PLANE0_FD_EXT;
  116. - attribs[atti++] = fd;
  117. - attribs[atti++] = EGL_DMA_BUF_PLANE0_OFFSET_EXT;
  118. - attribs[atti++] = offsets[0];
  119. - attribs[atti++] = EGL_DMA_BUF_PLANE0_PITCH_EXT;
  120. - attribs[atti++] = strides[0];
  121. - if (has_modifier)
  122. - {
  123. - attribs[atti++] = EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT;
  124. - attribs[atti++] = modifiers[0] & 0xFFFFFFFF;
  125. - attribs[atti++] = EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT;
  126. - attribs[atti++] = modifiers[0] >> 32;
  127. - }
  128. - }
  129. -
  130. - if (n_planes > 1)
  131. - {
  132. - attribs[atti++] = EGL_DMA_BUF_PLANE1_FD_EXT;
  133. - attribs[atti++] = fd;
  134. - attribs[atti++] = EGL_DMA_BUF_PLANE1_OFFSET_EXT;
  135. - attribs[atti++] = offsets[1];
  136. - attribs[atti++] = EGL_DMA_BUF_PLANE1_PITCH_EXT;
  137. - attribs[atti++] = strides[1];
  138. - if (has_modifier)
  139. - {
  140. - attribs[atti++] = EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT;
  141. - attribs[atti++] = modifiers[1] & 0xFFFFFFFF;
  142. - attribs[atti++] = EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT;
  143. - attribs[atti++] = modifiers[1] >> 32;
  144. - }
  145. - }
  146. -
  147. - if (n_planes > 2)
  148. - {
  149. - attribs[atti++] = EGL_DMA_BUF_PLANE2_FD_EXT;
  150. - attribs[atti++] = fd;
  151. - attribs[atti++] = EGL_DMA_BUF_PLANE2_OFFSET_EXT;
  152. - attribs[atti++] = offsets[2];
  153. - attribs[atti++] = EGL_DMA_BUF_PLANE2_PITCH_EXT;
  154. - attribs[atti++] = strides[2];
  155. - if (has_modifier)
  156. - {
  157. - attribs[atti++] = EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT;
  158. - attribs[atti++] = modifiers[2] & 0xFFFFFFFF;
  159. - attribs[atti++] = EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT;
  160. - attribs[atti++] = modifiers[2] >> 32;
  161. - }
  162. - }
  163. -
  164. - attribs[atti++] = EGL_NONE;
  165. + EGLint attributes[] = {
  166. + EGL_WIDTH, width,
  167. + EGL_HEIGHT, height,
  168. + EGL_LINUX_DRM_FOURCC_EXT, format,
  169. + EGL_DMA_BUF_PLANE0_FD_EXT, fd,
  170. + EGL_DMA_BUF_PLANE0_OFFSET_EXT, 0,
  171. + EGL_DMA_BUF_PLANE0_PITCH_EXT, stride,
  172. + EGL_NONE
  173. + };
  174.  
  175. return meta_egl_create_image (egl, egl_display, EGL_NO_CONTEXT,
  176. EGL_LINUX_DMA_BUF_EXT, NULL,
  177. - attribs,
  178. + attributes,
  179. error);
  180. }
  181.  
  182. @@ -190,10 +120,7 @@ meta_renderer_native_gles3_blit_shared_bo (MetaEgl *egl,
  183. int shared_bo_fd;
  184. unsigned int width;
  185. unsigned int height;
  186. - uint32_t i, n_planes;
  187. - uint32_t strides[4] = { 0 };
  188. - uint32_t offsets[4] = { 0 };
  189. - uint64_t modifiers[4] = { 0 };
  190. + uint32_t stride;
  191. uint32_t format;
  192. EGLImageKHR egl_image;
  193.  
  194. @@ -207,23 +134,14 @@ meta_renderer_native_gles3_blit_shared_bo (MetaEgl *egl,
  195.  
  196. width = gbm_bo_get_width (shared_bo);
  197. height = gbm_bo_get_height (shared_bo);
  198. + stride = gbm_bo_get_stride (shared_bo);
  199. format = gbm_bo_get_format (shared_bo);
  200.  
  201. - n_planes = gbm_bo_get_plane_count (shared_bo);
  202. - for (i = 0; i < n_planes; i++)
  203. - {
  204. - strides[i] = gbm_bo_get_stride_for_plane (shared_bo, i);
  205. - offsets[i] = gbm_bo_get_offset (shared_bo, i);
  206. - modifiers[i] = gbm_bo_get_modifier (shared_bo);
  207. - }
  208. -
  209. egl_image = create_egl_image (egl,
  210. egl_display,
  211. egl_context,
  212. - width, height,
  213. - n_planes,
  214. - strides, offsets,
  215. - modifiers, format,
  216. + width, height, stride,
  217. + format,
  218. shared_bo_fd,
  219. error);
  220. close (shared_bo_fd);
  221. diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
  222. index 08b9bef..bb8c04c 100644
  223. --- a/src/backends/native/meta-renderer-native.c
  224. +++ b/src/backends/native/meta-renderer-native.c
  225. @@ -56,7 +56,6 @@
  226. #include "backends/meta-logical-monitor.h"
  227. #include "backends/meta-output.h"
  228. #include "backends/meta-renderer-view.h"
  229. -#include "backends/native/meta-crtc-kms.h"
  230. #include "backends/native/meta-gpu-kms.h"
  231. #include "backends/native/meta-monitor-manager-kms.h"
  232. #include "backends/native/meta-renderer-native.h"
  233. @@ -310,247 +309,6 @@ meta_onscreen_native_get_egl (MetaOnscreenNative *onscreen_native)
  234. return meta_renderer_native_get_egl (onscreen_native->renderer_native);
  235. }
  236.  
  237. -static GArray *
  238. -get_supported_kms_modifiers (CoglOnscreen *onscreen,
  239. - MetaGpu *gpu,
  240. - uint32_t format)
  241. -{
  242. - CoglOnscreenEGL *onscreen_egl = onscreen->winsys;
  243. - MetaOnscreenNative *onscreen_native = onscreen_egl->platform;
  244. - MetaLogicalMonitor *logical_monitor = onscreen_native->logical_monitor;
  245. - GArray *modifiers;
  246. - GArray *base_mods;
  247. - GList *l_crtc;
  248. - MetaCrtc *base_crtc = NULL;
  249. - GList *other_crtcs = NULL;
  250. - unsigned int i;
  251. -
  252. - if (!logical_monitor)
  253. - return NULL;
  254. -
  255. - /* Find our base CRTC to intersect against. */
  256. - for (l_crtc = meta_gpu_get_crtcs (gpu); l_crtc; l_crtc = l_crtc->next)
  257. - {
  258. - MetaCrtc *crtc = l_crtc->data;
  259. -
  260. - if (crtc->logical_monitor != logical_monitor)
  261. - continue;
  262. -
  263. - if (!base_crtc)
  264. - base_crtc = crtc;
  265. - else if (crtc == base_crtc)
  266. - continue;
  267. - else if (g_list_index (other_crtcs, crtc) == -1)
  268. - other_crtcs = g_list_append (other_crtcs, crtc);
  269. - }
  270. -
  271. - if (!base_crtc)
  272. - goto out;
  273. -
  274. - base_mods = meta_crtc_kms_get_modifiers (base_crtc, format);
  275. - if (!base_mods)
  276. - goto out;
  277. -
  278. - /*
  279. - * If this is the only CRTC we have, we don't need to intersect the sets of
  280. - * modifiers.
  281. - */
  282. - if (other_crtcs == NULL)
  283. - {
  284. - modifiers = g_array_sized_new (FALSE, FALSE, sizeof (uint64_t),
  285. - base_mods->len);
  286. - g_array_append_vals (modifiers, base_mods->data, base_mods->len);
  287. - return modifiers;
  288. - }
  289. -
  290. - modifiers = g_array_new (FALSE, FALSE, sizeof (uint64_t));
  291. -
  292. - /*
  293. - * For each modifier from base_crtc, check if it's available on all other
  294. - * CRTCs.
  295. - */
  296. - for (i = 0; i < base_mods->len; i++)
  297. - {
  298. - uint64_t modifier = g_array_index (base_mods, uint64_t, i);
  299. - gboolean found_everywhere = TRUE;
  300. - GList *k;
  301. -
  302. - /* Check if we have the same modifier available for all CRTCs. */
  303. - for (k = other_crtcs; k; k = k->next)
  304. - {
  305. - MetaCrtc *crtc = k->data;
  306. - GArray *crtc_mods;
  307. - unsigned int m;
  308. - gboolean found_here = FALSE;
  309. -
  310. - if (crtc->logical_monitor != logical_monitor)
  311. - continue;
  312. -
  313. - crtc_mods = meta_crtc_kms_get_modifiers (crtc, format);
  314. - if (!crtc_mods)
  315. - {
  316. - g_array_free (modifiers, TRUE);
  317. - goto out;
  318. - }
  319. -
  320. - for (m = 0; m < crtc_mods->len; m++)
  321. - {
  322. - uint64_t local_mod = g_array_index (crtc_mods, uint64_t, m);
  323. -
  324. - if (local_mod == modifier)
  325. - {
  326. - found_here = TRUE;
  327. - break;
  328. - }
  329. - }
  330. -
  331. - if (!found_here)
  332. - {
  333. - found_everywhere = FALSE;
  334. - break;
  335. - }
  336. - }
  337. -
  338. - if (found_everywhere)
  339. - g_array_append_val (modifiers, modifier);
  340. - }
  341. -
  342. - if (modifiers->len == 0)
  343. - {
  344. - g_array_free (modifiers, TRUE);
  345. - goto out;
  346. - }
  347. -
  348. - return modifiers;
  349. -
  350. -out:
  351. - g_list_free (other_crtcs);
  352. - return NULL;
  353. -}
  354. -
  355. -static GArray *
  356. -get_supported_egl_modifiers (CoglOnscreen *onscreen,
  357. - MetaGpu *gpu,
  358. - uint32_t format)
  359. -{
  360. - CoglOnscreenEGL *onscreen_egl = onscreen->winsys;
  361. - MetaOnscreenNative *onscreen_native = onscreen_egl->platform;
  362. - MetaRendererNative *renderer_native = onscreen_native->renderer_native;
  363. - MetaEgl *egl = meta_onscreen_native_get_egl (onscreen_native);
  364. - MetaRendererNativeGpuData *renderer_gpu_data;
  365. - EGLint num_modifiers;
  366. - GArray *modifiers;
  367. - GError *error = NULL;
  368. - gboolean ret;
  369. -
  370. - renderer_gpu_data = meta_renderer_native_get_gpu_data (renderer_native,
  371. - META_GPU_KMS (gpu));
  372. -
  373. - if (!meta_egl_has_extensions (egl, renderer_gpu_data->egl_display, NULL,
  374. - "EGL_EXT_image_dma_buf_import_modifiers",
  375. - NULL))
  376. - return NULL;
  377. -
  378. - ret = meta_egl_query_dma_buf_modifiers (egl, renderer_gpu_data->egl_display,
  379. - format, 0, NULL, NULL,
  380. - &num_modifiers, NULL);
  381. - if (!ret || num_modifiers == 0)
  382. - return NULL;
  383. -
  384. - modifiers = g_array_sized_new (FALSE, FALSE, sizeof (uint64_t),
  385. - num_modifiers);
  386. - ret = meta_egl_query_dma_buf_modifiers (egl, renderer_gpu_data->egl_display,
  387. - format, num_modifiers,
  388. - (EGLuint64KHR *) modifiers->data, NULL,
  389. - &num_modifiers, &error);
  390. -
  391. - if (!ret)
  392. - {
  393. - g_warning ("Failed to query DMABUF modifiers: %s", error->message);
  394. - g_error_free (error);
  395. - g_array_free (modifiers, TRUE);
  396. - return NULL;
  397. - }
  398. -
  399. - return modifiers;
  400. -}
  401. -
  402. -static GArray *
  403. -get_supported_modifiers (CoglOnscreen *onscreen,
  404. - uint32_t format)
  405. -{
  406. - CoglOnscreenEGL *onscreen_egl = onscreen->winsys;
  407. - MetaOnscreenNative *onscreen_native = onscreen_egl->platform;
  408. - MetaLogicalMonitor *logical_monitor = onscreen_native->logical_monitor;
  409. - GArray *modifiers = NULL;
  410. - GArray *gpu_mods;
  411. - GList *l_monitor;
  412. - unsigned int i;
  413. -
  414. - if (!logical_monitor)
  415. - return NULL;
  416. -
  417. - /* Find our base CRTC to intersect against. */
  418. - for (l_monitor = meta_logical_monitor_get_monitors (logical_monitor);
  419. - l_monitor;
  420. - l_monitor = l_monitor->next)
  421. - {
  422. - MetaMonitor *monitor = l_monitor->data;
  423. - MetaGpu *gpu = meta_monitor_get_gpu (monitor);
  424. -
  425. - if (gpu == META_GPU (onscreen_native->render_gpu))
  426. - gpu_mods = get_supported_kms_modifiers (onscreen, gpu, format);
  427. - else
  428. - gpu_mods = get_supported_egl_modifiers (onscreen, gpu, format);
  429. -
  430. - if (!gpu_mods)
  431. - {
  432. - g_array_free (modifiers, TRUE);
  433. - return NULL;
  434. - }
  435. -
  436. - if (!modifiers)
  437. - {
  438. - modifiers = gpu_mods;
  439. - continue;
  440. - }
  441. -
  442. - for (i = 0; i < modifiers->len; i++)
  443. - {
  444. - uint64_t modifier = g_array_index (modifiers, uint64_t, i);
  445. - gboolean found = FALSE;
  446. - unsigned int m;
  447. -
  448. - for (m = 0; m < gpu_mods->len; m++)
  449. - {
  450. - uint64_t gpu_mod = g_array_index (gpu_mods, uint64_t, m);
  451. -
  452. - if (gpu_mod == modifier)
  453. - {
  454. - found = TRUE;
  455. - break;
  456. - }
  457. - }
  458. -
  459. - if (!found)
  460. - {
  461. - g_array_remove_index_fast (modifiers, i);
  462. - i--;
  463. - }
  464. - }
  465. -
  466. - g_array_free (gpu_mods, TRUE);
  467. - }
  468. -
  469. - if (modifiers && modifiers->len == 0)
  470. - {
  471. - g_array_free (modifiers, TRUE);
  472. - return NULL;
  473. - }
  474. -
  475. - return modifiers;
  476. -}
  477. -
  478. static gboolean
  479. init_secondary_gpu_state_gpu_copy_mode (MetaRendererNative *renderer_native,
  480. CoglOnscreen *onscreen,
  481. @@ -1614,7 +1372,7 @@ gbm_get_next_fb_id (MetaGpuKms *gpu_kms,
  482. uint32_t strides[4] = { 0, };
  483. uint32_t offsets[4] = { 0, };
  484. uint64_t modifiers[4] = { 0, };
  485. - int i;
  486. +// int i;
  487.  
  488. /* Now we need to set the CRTC to whatever is the front buffer */
  489. next_bo = gbm_surface_lock_front_buffer (gbm_surface);
  490. @@ -1625,7 +1383,7 @@ gbm_get_next_fb_id (MetaGpuKms *gpu_kms,
  491. return FALSE;
  492. }
  493.  
  494. - if (gbm_bo_get_handle_for_plane (next_bo, 0).s32 == -1)
  495. +// if (gbm_bo_get_handle_for_plane (next_bo, 0).s32 == -1)
  496. {
  497. /* Failed to fetch handle to plane, falling back to old method */
  498. strides[0] = gbm_bo_get_stride (next_bo);
  499. @@ -1633,16 +1391,16 @@ gbm_get_next_fb_id (MetaGpuKms *gpu_kms,
  500. offsets[0] = 0;
  501. modifiers[0] = DRM_FORMAT_MOD_INVALID;
  502. }
  503. - else
  504. - {
  505. - for (i = 0; i < gbm_bo_get_plane_count (next_bo); i++)
  506. - {
  507. - strides[i] = gbm_bo_get_stride_for_plane (next_bo, i);
  508. - handles[i] = gbm_bo_get_handle_for_plane (next_bo, i).u32;
  509. - offsets[i] = gbm_bo_get_offset (next_bo, i);
  510. - modifiers[i] = gbm_bo_get_modifier (next_bo);
  511. - }
  512. - }
  513. +// else
  514. +// {
  515. +// for (i = 0; i < gbm_bo_get_plane_count (next_bo); i++)
  516. +// {
  517. +// strides[i] = gbm_bo_get_stride_for_plane (next_bo, i);
  518. +// handles[i] = gbm_bo_get_handle_for_plane (next_bo, i).u32;
  519. +// offsets[i] = gbm_bo_get_offset (next_bo, i);
  520. +// modifiers[i] = gbm_bo_get_modifier (next_bo);
  521. +// }
  522. +// }
  523.  
  524. kms_fd = meta_gpu_kms_get_fd (gpu_kms);
  525.  
  526. @@ -2034,26 +1792,26 @@ meta_renderer_native_create_surface_gbm (CoglOnscreen *onscreen,
  527. EGLNativeWindowType egl_native_window;
  528. EGLSurface new_egl_surface;
  529. uint32_t format = GBM_FORMAT_XRGB8888;
  530. - GArray *modifiers;
  531. +// GArray *modifiers;
  532.  
  533. renderer_gpu_data =
  534. meta_renderer_native_get_gpu_data (renderer_native,
  535. onscreen_native->render_gpu);
  536.  
  537. - if (renderer_native->use_modifiers)
  538. - modifiers = get_supported_modifiers (onscreen, format);
  539. - else
  540. - modifiers = NULL;
  541. -
  542. - if (modifiers)
  543. - {
  544. - new_gbm_surface =
  545. - gbm_surface_create_with_modifiers (renderer_gpu_data->gbm.device,
  546. - width, height, format,
  547. - (uint64_t *) modifiers->data,
  548. - modifiers->len);
  549. - g_array_free (modifiers, TRUE);
  550. - }
  551. +// if (renderer_native->use_modifiers)
  552. +// modifiers = get_supported_modifiers (onscreen, format);
  553. +// else
  554. +// modifiers = NULL;
  555. +
  556. +// if (modifiers)
  557. +// {
  558. +// new_gbm_surface =
  559. +// gbm_surface_create_with_modifiers (renderer_gpu_data->gbm.device,
  560. +// width, height, format,
  561. +// (uint64_t *) modifiers->data,
  562. +// modifiers->len);
  563. +// g_array_free (modifiers, TRUE);
  564. +// }
  565.  
  566. if (!new_gbm_surface)
  567. {
  568. diff --git a/src/backends/x11/meta-renderer-x11.c b/src/backends/x11/meta-renderer-x11.c
  569. index bb52d3c..b7809fe 100644
  570. --- a/src/backends/x11/meta-renderer-x11.c
  571. +++ b/src/backends/x11/meta-renderer-x11.c
  572. @@ -53,9 +53,9 @@ get_x11_cogl_winsys_vtable (CoglRenderer *renderer)
  573. case COGL_DRIVER_GLES1:
  574. case COGL_DRIVER_GLES2:
  575. return _cogl_winsys_egl_xlib_get_vtable ();
  576. - case COGL_DRIVER_GL:
  577. - case COGL_DRIVER_GL3:
  578. - return _cogl_winsys_glx_get_vtable ();
  579. +// case COGL_DRIVER_GL:
  580. +// case COGL_DRIVER_GL3:
  581. +// return _cogl_winsys_glx_get_vtable ();
  582. case COGL_DRIVER_ANY:
  583. case COGL_DRIVER_NOP:
  584. case COGL_DRIVER_WEBGL:
  585. --
  586. 2.17.1
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!