← Back to branch summary

~vanvugt/mir/fix-1315302

~vanvugt/mir/fix-1315302

Viewing all changes in revision 1575.

Committer: Tarmac
Author(s): Kevin DuBois
Date: 2014-04-25 12:35:50 UTC
mfrom: (1556.2.15 plumb-android-shader-creation)
Revision ID: tarmac-20140425123550-c7565by6ukd3mjvh

android: plumb getting the gl program factory down to the android platform, and use it to make a simple placeholder shader program.

Approved by Alexandros Frantzis, PS Jenkins bot, Cemil Azizoglu, Chris Halse Rogers.

files added:
include/test/mir_test_doubles/stub_gl_program_factory.h

src/platform/graphics/android/overlay_gl_compositor.cpp

src/platform/graphics/android/overlay_gl_compositor.h

tests/unit-tests/graphics/android/test_overlay_compositor.cpp

files renamed:
include/server/mir/graphics/gl_program.h => include/platform/mir/graphics/gl_program.h

files modified:
examples/render_overlays.cpp

include/platform/mir/graphics/platform.h

include/test/mir_test_doubles/null_platform.h

include/test/mir_test_doubles/stub_display_builder.h

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display.h

src/platform/graphics/android/android_platform.cpp

src/platform/graphics/android/android_platform.h

src/platform/graphics/android/display_buffer.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/display_builder.h

src/platform/graphics/android/output_builder.cpp

src/platform/graphics/android/output_builder.h

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/platform.h

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/nested_platform.cpp

src/server/graphics/nested/nested_platform.h

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/integration-tests/graphics/android/test_display_integration.cpp

tests/integration-tests/graphics/mesa/test_buffer_integration.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/android/CMakeLists.txt

tests/unit-tests/graphics/android/test_android_fb.cpp

tests/unit-tests/graphics/android/test_hwc_display.cpp

tests/unit-tests/graphics/android/test_output_builder.cpp

tests/unit-tests/graphics/mesa/test_display_configuration.cpp

tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp

tests/unit-tests/graphics/test_display.cpp

Show diffs side-by-side

added added

removed removed

examples/render_overlays.cpp

include/platform/mir/graphics/gl_program.h

include/platform/mir/graphics/platform.h

include/test/mir_test_doubles/null_platform.h

include/test/mir_test_doubles/stub_display_builder.h

include/test/mir_test_doubles/stub_gl_program_factory.h

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display.h

src/platform/graphics/android/android_platform.cpp

src/platform/graphics/android/android_platform.h

src/platform/graphics/android/display_buffer.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/display_builder.h

src/platform/graphics/android/output_builder.cpp

src/platform/graphics/android/output_builder.h

src/platform/graphics/android/overlay_gl_compositor.cpp

src/platform/graphics/android/overlay_gl_compositor.h

src/platform/graphics/mesa/platform.cpp

src/platform/graphics/mesa/platform.h

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/nested_platform.cpp

src/server/graphics/nested/nested_platform.h

tests/acceptance-tests/test_display_configuration.cpp

tests/acceptance-tests/test_surfaces_with_output_id.cpp

tests/integration-tests/graphics/android/test_display_integration.cpp

tests/integration-tests/graphics/mesa/test_buffer_integration.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/android/CMakeLists.txt

tests/unit-tests/graphics/android/test_android_fb.cpp

tests/unit-tests/graphics/android/test_hwc_display.cpp

tests/unit-tests/graphics/android/test_output_builder.cpp

tests/unit-tests/graphics/android/test_overlay_compositor.cpp

tests/unit-tests/graphics/mesa/test_display_configuration.cpp

tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp

tests/unit-tests/graphics/test_display.cpp

Older »