diff options
Diffstat (limited to 'meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/files/0002-native-state-fbdev-Add-support-for-glmark2-es2-fbdev.patch')
-rw-r--r-- | meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/files/0002-native-state-fbdev-Add-support-for-glmark2-es2-fbdev.patch | 79 |
1 files changed, 37 insertions, 42 deletions
diff --git a/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/files/0002-native-state-fbdev-Add-support-for-glmark2-es2-fbdev.patch b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/files/0002-native-state-fbdev-Add-support-for-glmark2-es2-fbdev.patch index 5b4ffaaf..83e5b58a 100644 --- a/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/files/0002-native-state-fbdev-Add-support-for-glmark2-es2-fbdev.patch +++ b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/files/0002-native-state-fbdev-Add-support-for-glmark2-es2-fbdev.patch | |||
@@ -19,11 +19,11 @@ Signed-off-by: Mark Hatle <mark.hatle@amd.com> | |||
19 | create mode 100644 src/native-state-fbdev.cpp | 19 | create mode 100644 src/native-state-fbdev.cpp |
20 | create mode 100644 src/native-state-fbdev.h | 20 | create mode 100644 src/native-state-fbdev.h |
21 | 21 | ||
22 | diff --git a/src/gl-state-egl.cpp b/src/gl-state-egl.cpp | 22 | Index: git/src/gl-state-egl.cpp |
23 | index 5a6843c..14c7dac 100644 | 23 | =================================================================== |
24 | --- a/src/gl-state-egl.cpp | 24 | --- git.orig/src/gl-state-egl.cpp |
25 | +++ b/src/gl-state-egl.cpp | 25 | +++ git/src/gl-state-egl.cpp |
26 | @@ -510,6 +510,7 @@ GLStateEGL::gotValidDisplay() | 26 | @@ -508,6 +508,7 @@ GLStateEGL::gotValidDisplay() |
27 | return false; | 27 | return false; |
28 | } | 28 | } |
29 | 29 | ||
@@ -31,7 +31,7 @@ index 5a6843c..14c7dac 100644 | |||
31 | char const * __restrict const supported_extensions = | 31 | char const * __restrict const supported_extensions = |
32 | egl_query_string(EGL_NO_DISPLAY, EGL_EXTENSIONS); | 32 | egl_query_string(EGL_NO_DISPLAY, EGL_EXTENSIONS); |
33 | 33 | ||
34 | @@ -543,6 +544,9 @@ GLStateEGL::gotValidDisplay() | 34 | @@ -541,6 +542,9 @@ GLStateEGL::gotValidDisplay() |
35 | Log::debug("Falling back to eglGetDisplay()\n"); | 35 | Log::debug("Falling back to eglGetDisplay()\n"); |
36 | egl_display_ = egl_get_display(native_display_); | 36 | egl_display_ = egl_get_display(native_display_); |
37 | } | 37 | } |
@@ -41,11 +41,11 @@ index 5a6843c..14c7dac 100644 | |||
41 | 41 | ||
42 | if (!egl_display_) { | 42 | if (!egl_display_) { |
43 | Log::error("eglGetDisplay() failed with error: 0x%x\n", egl_get_error()); | 43 | Log::error("eglGetDisplay() failed with error: 0x%x\n", egl_get_error()); |
44 | diff --git a/src/main.cpp b/src/main.cpp | 44 | Index: git/src/main.cpp |
45 | index ce8b094..7c9f501 100644 | 45 | =================================================================== |
46 | --- a/src/main.cpp | 46 | --- git.orig/src/main.cpp |
47 | +++ b/src/main.cpp | 47 | +++ git/src/main.cpp |
48 | @@ -36,6 +36,8 @@ | 48 | @@ -37,6 +37,8 @@ |
49 | 49 | ||
50 | #if GLMARK2_USE_X11 | 50 | #if GLMARK2_USE_X11 |
51 | #include "native-state-x11.h" | 51 | #include "native-state-x11.h" |
@@ -53,21 +53,20 @@ index ce8b094..7c9f501 100644 | |||
53 | +#include "native-state-fbdev.h" | 53 | +#include "native-state-fbdev.h" |
54 | #elif GLMARK2_USE_DRM | 54 | #elif GLMARK2_USE_DRM |
55 | #include "native-state-drm.h" | 55 | #include "native-state-drm.h" |
56 | #elif GLMARK2_USE_MIR | 56 | #elif GLMARK2_USE_GBM |
57 | @@ -172,6 +174,8 @@ main(int argc, char *argv[]) | 57 | @@ -160,6 +162,8 @@ main(int argc, char *argv[]) |
58 | // Create the canvas | 58 | { |
59 | #if GLMARK2_USE_X11 | 59 | #if GLMARK2_USE_X11 |
60 | NativeStateX11 native_state; | 60 | NativeStateX11 native_state; |
61 | +#elif GLMARK2_USE_FBDEV | 61 | +#elif GLMARK2_USE_FBDEV |
62 | + NativeStateFbdev native_state; | 62 | + NativeStateFbdev native_state; |
63 | #elif GLMARK2_USE_DRM | 63 | #elif GLMARK2_USE_DRM |
64 | NativeStateDRM native_state; | 64 | NativeStateDRM native_state; |
65 | #elif GLMARK2_USE_MIR | 65 | #elif GLMARK2_USE_GBM |
66 | diff --git a/src/native-state-fbdev.cpp b/src/native-state-fbdev.cpp | 66 | Index: git/src/native-state-fbdev.cpp |
67 | new file mode 100644 | 67 | =================================================================== |
68 | index 0000000..0c82a25 | ||
69 | --- /dev/null | 68 | --- /dev/null |
70 | +++ b/src/native-state-fbdev.cpp | 69 | +++ git/src/native-state-fbdev.cpp |
71 | @@ -0,0 +1,172 @@ | 70 | @@ -0,0 +1,172 @@ |
72 | + | 71 | + |
73 | +/* | 72 | +/* |
@@ -241,11 +240,10 @@ index 0000000..0c82a25 | |||
241 | + | 240 | + |
242 | + return fd; | 241 | + return fd; |
243 | +} | 242 | +} |
244 | diff --git a/src/native-state-fbdev.h b/src/native-state-fbdev.h | 243 | Index: git/src/native-state-fbdev.h |
245 | new file mode 100644 | 244 | =================================================================== |
246 | index 0000000..0162ee0 | ||
247 | --- /dev/null | 245 | --- /dev/null |
248 | +++ b/src/native-state-fbdev.h | 246 | +++ git/src/native-state-fbdev.h |
249 | @@ -0,0 +1,59 @@ | 247 | @@ -0,0 +1,59 @@ |
250 | +/* | 248 | +/* |
251 | + * Copyright © 2018 Xilinx Inc | 249 | + * Copyright © 2018 Xilinx Inc |
@@ -306,11 +304,11 @@ index 0000000..0162ee0 | |||
306 | +}; | 304 | +}; |
307 | + | 305 | + |
308 | +#endif /* GLMARK2_NATIVE_STATE_FBDEV_H_ */ | 306 | +#endif /* GLMARK2_NATIVE_STATE_FBDEV_H_ */ |
309 | diff --git a/src/wscript_build b/src/wscript_build | 307 | Index: git/src/wscript_build |
310 | index a01c8a8..c179342 100644 | 308 | =================================================================== |
311 | --- a/src/wscript_build | 309 | --- git.orig/src/wscript_build |
312 | +++ b/src/wscript_build | 310 | +++ git/src/wscript_build |
313 | @@ -90,6 +90,7 @@ flavor_sources = { | 311 | @@ -88,6 +88,7 @@ flavor_sources = { |
314 | 'win32-glesv2': common_flavor_sources + ['native-state-win32.cpp', 'gl-state-egl.cpp'], | 312 | 'win32-glesv2': common_flavor_sources + ['native-state-win32.cpp', 'gl-state-egl.cpp'], |
315 | 'x11-gl' : common_flavor_sources + ['native-state-x11.cpp', 'gl-state-glx.cpp'], | 313 | 'x11-gl' : common_flavor_sources + ['native-state-x11.cpp', 'gl-state-glx.cpp'], |
316 | 'x11-glesv2' : common_flavor_sources + ['native-state-x11.cpp', 'gl-state-egl.cpp'], | 314 | 'x11-glesv2' : common_flavor_sources + ['native-state-x11.cpp', 'gl-state-egl.cpp'], |
@@ -318,7 +316,7 @@ index a01c8a8..c179342 100644 | |||
318 | } | 316 | } |
319 | flavor_uselibs = { | 317 | flavor_uselibs = { |
320 | 'dispmanx-glesv2' : ['glad-egl-dispmanx', 'glad-glesv2', 'matrix-glesv2', 'common-glesv2', 'dispmanx'], | 318 | 'dispmanx-glesv2' : ['glad-egl-dispmanx', 'glad-glesv2', 'matrix-glesv2', 'common-glesv2', 'dispmanx'], |
321 | @@ -103,6 +104,7 @@ flavor_uselibs = { | 319 | @@ -99,6 +100,7 @@ flavor_uselibs = { |
322 | 'win32-glesv2': ['glad-egl-win32', 'glad-glesv2', 'matrix-glesv2', 'common-glesv2'], | 320 | 'win32-glesv2': ['glad-egl-win32', 'glad-glesv2', 'matrix-glesv2', 'common-glesv2'], |
323 | 'x11-gl' : ['x11', 'glad-gl', 'glad-glx', 'matrix-gl', 'common-gl'], | 321 | 'x11-gl' : ['x11', 'glad-gl', 'glad-glx', 'matrix-gl', 'common-gl'], |
324 | 'x11-glesv2' : ['x11', 'glad-egl-x11', 'glad-glesv2', 'matrix-glesv2', 'common-glesv2'], | 322 | 'x11-glesv2' : ['x11', 'glad-egl-x11', 'glad-glesv2', 'matrix-glesv2', 'common-glesv2'], |
@@ -326,7 +324,7 @@ index a01c8a8..c179342 100644 | |||
326 | } | 324 | } |
327 | 325 | ||
328 | flavor_defines = { | 326 | flavor_defines = { |
329 | @@ -117,6 +119,7 @@ flavor_defines = { | 327 | @@ -111,6 +113,7 @@ flavor_defines = { |
330 | 'win32-glesv2': ['GLMARK2_USE_WIN32', 'GLMARK2_USE_GLESv2', 'GLMARK2_USE_EGL'], | 328 | 'win32-glesv2': ['GLMARK2_USE_WIN32', 'GLMARK2_USE_GLESv2', 'GLMARK2_USE_EGL'], |
331 | 'x11-gl' : ['GLMARK2_USE_X11', 'GLMARK2_USE_GL', 'GLMARK2_USE_GLX'], | 329 | 'x11-gl' : ['GLMARK2_USE_X11', 'GLMARK2_USE_GL', 'GLMARK2_USE_GLX'], |
332 | 'x11-glesv2' : ['GLMARK2_USE_X11', 'GLMARK2_USE_GLESv2', 'GLMARK2_USE_EGL'], | 330 | 'x11-glesv2' : ['GLMARK2_USE_X11', 'GLMARK2_USE_GLESv2', 'GLMARK2_USE_EGL'], |
@@ -334,7 +332,7 @@ index a01c8a8..c179342 100644 | |||
334 | } | 332 | } |
335 | flavor_libs = { | 333 | flavor_libs = { |
336 | 'dispmanx-glesv2' : [], | 334 | 'dispmanx-glesv2' : [], |
337 | @@ -156,6 +159,7 @@ flavor_sources_gen = { | 335 | @@ -144,6 +147,7 @@ flavor_sources_gen = { |
338 | 'win32-glesv2' : [], | 336 | 'win32-glesv2' : [], |
339 | 'x11-gl' : [], | 337 | 'x11-gl' : [], |
340 | 'x11-glesv2' : [], | 338 | 'x11-glesv2' : [], |
@@ -342,7 +340,7 @@ index a01c8a8..c179342 100644 | |||
342 | } | 340 | } |
343 | egl_platform_defines = { | 341 | egl_platform_defines = { |
344 | 'dispmanx' : ['MESA_EGL_NO_X11_HEADERS'], | 342 | 'dispmanx' : ['MESA_EGL_NO_X11_HEADERS'], |
345 | @@ -164,6 +168,7 @@ egl_platform_defines = { | 343 | @@ -151,6 +155,7 @@ egl_platform_defines = { |
346 | 'wayland' : ['WL_EGL_PLATFORM'], | 344 | 'wayland' : ['WL_EGL_PLATFORM'], |
347 | 'win32' : [], | 345 | 'win32' : [], |
348 | 'x11' : [], | 346 | 'x11' : [], |
@@ -350,11 +348,11 @@ index a01c8a8..c179342 100644 | |||
350 | } | 348 | } |
351 | 349 | ||
352 | includes = ['.', 'scene-ideas', 'scene-terrain'] + platform_includes | 350 | includes = ['.', 'scene-ideas', 'scene-terrain'] + platform_includes |
353 | diff --git a/wscript b/wscript | 351 | Index: git/wscript |
354 | index cecc3d9..4ae50d8 100644 | 352 | =================================================================== |
355 | --- a/wscript | 353 | --- git.orig/wscript |
356 | +++ b/wscript | 354 | +++ git/wscript |
357 | @@ -19,6 +19,7 @@ FLAVORS = { | 355 | @@ -17,6 +17,7 @@ FLAVORS = { |
358 | 'win32-glesv2': 'glmark2-es2', | 356 | 'win32-glesv2': 'glmark2-es2', |
359 | 'x11-gl' : 'glmark2', | 357 | 'x11-gl' : 'glmark2', |
360 | 'x11-glesv2' : 'glmark2-es2', | 358 | 'x11-glesv2' : 'glmark2-es2', |
@@ -362,14 +360,11 @@ index cecc3d9..4ae50d8 100644 | |||
362 | } | 360 | } |
363 | FLAVORS_STR = ", ".join(sorted(list(FLAVORS) + ['all-linux', 'all-win32'])) | 361 | FLAVORS_STR = ", ".join(sorted(list(FLAVORS) + ['all-linux', 'all-win32'])) |
364 | 362 | ||
365 | @@ -213,6 +214,7 @@ def configure_linux(ctx): | 363 | @@ -210,6 +211,7 @@ def configure_linux(ctx): |
364 | ('libdrm','drm', None, list_contains(ctx.options.flavors, 'drm')), | ||
366 | ('gbm','gbm', None, list_contains(ctx.options.flavors, 'drm')), | 365 | ('gbm','gbm', None, list_contains(ctx.options.flavors, 'drm')), |
367 | ('libudev', 'udev', None, list_contains(ctx.options.flavors, 'drm')), | 366 | ('libudev', 'udev', None, list_contains(ctx.options.flavors, 'drm')), |
368 | ('mirclient','mirclient', '0.13', list_contains(ctx.options.flavors, 'mir')), | ||
369 | + ('libudev', 'udev', None, list_contains(ctx.options.flavors, 'fbdev')), | 367 | + ('libudev', 'udev', None, list_contains(ctx.options.flavors, 'fbdev')), |
370 | ('wayland-client','wayland-client', None, list_contains(ctx.options.flavors, 'wayland')), | 368 | ('wayland-client','wayland-client', None, list_contains(ctx.options.flavors, 'wayland')), |
371 | ('wayland-cursor','wayland-cursor', None, list_contains(ctx.options.flavors, 'wayland')), | 369 | ('wayland-cursor','wayland-cursor', None, list_contains(ctx.options.flavors, 'wayland')), |
372 | ('wayland-egl','wayland-egl', None, list_contains(ctx.options.flavors, 'wayland'))] | 370 | ('wayland-egl','wayland-egl', None, list_contains(ctx.options.flavors, 'wayland'))] |
373 | -- | ||
374 | 2.17.1 | ||
375 | |||