← Back to branch summary

~mir-team/mir/development-branch

~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to playground/demo-shell/demo_renderer.cpp

Committer: Tarmac
Author(s): Daniel van Vugt
Date: 2016-05-20 07:19:12 UTC
mfrom: (3506.5.22 full-gl)
Revision ID: tarmac-20160520071912-5z8y06mdasike9qa

Introducing full desktop GL support for Mir servers (LP: #1420581)

It works well with Mesa, but is disabled by default due to one
remaining "TODO" you will find.

Note the new eglBindAPI calls. Without those, EGL makes all new
threads default to ES. And then eglMakeContext/eglGetCurrent*
functions will randomly fail. So we need to be sure any thread
that touches EGL will call eglBindAPI with the correct value
first. Fixes: https://bugs.launchpad.net/bugs/1420581.

Approved by Cemil Azizoglu, mir-ci-bot.

files modified:
CMakeLists.txt

debian/control

examples/CMakeLists.txt

examples/graphics_utils.cpp

examples/image_renderer.cpp

examples/server_example_adorning_compositor.cpp

include/test/mir/test/doubles/mock_egl.h

playground/demo-shell/demo_renderer.cpp

playground/demo-shell/typo/CMakeLists.txt

playground/demo-shell/typo/typo_glcache.cpp

src/gl/program.cpp

src/include/gl/mir/gl/primitive.h

src/include/gl/mir/gl/program.h

src/include/gl/mir/gl/texture.h

src/include/platform/mir/graphics/egl_extensions.h

src/platform/CMakeLists.txt

src/platform/graphics/CMakeLists.txt

src/platform/graphics/egl_extensions.cpp

src/platforms/android/include/egl_sync_extensions.h

src/platforms/android/server/buffer.h

src/platforms/android/server/hwc_fallback_gl_renderer.cpp

src/platforms/common/server/CMakeLists.txt

src/platforms/common/server/shm_buffer.cpp

src/platforms/mesa/server/buffer_allocator.cpp

src/platforms/mesa/server/display_helpers.cpp

src/platforms/mesa/server/kms/CMakeLists.txt

src/platforms/mesa/server/kms/display_buffer.cpp

src/platforms/mesa/server/x11/CMakeLists.txt

src/platforms/mesa/server/x11/graphics/CMakeLists.txt

src/platforms/mesa/server/x11/graphics/display.cpp

src/renderers/gl/program_family.cpp

src/renderers/gl/program_family.h

src/renderers/gl/renderer.cpp

src/renderers/gl/renderer.h

src/server/CMakeLists.txt

src/server/compositor/screencast_display_buffer.h

src/server/graphics/CMakeLists.txt

src/server/graphics/nested/display.cpp

src/server/graphics/nested/display.h

src/server/graphics/nested/display_buffer.cpp

src/server/graphics/offscreen/display.cpp

src/server/graphics/offscreen/display_buffer.cpp

src/server/graphics/surfaceless_egl_context.cpp

src/server/scene/gl_pixel_buffer.cpp

src/server/scene/gl_pixel_buffer.h

tests/unit-tests/graphics/test_shm_buffer.cpp

Show diffs side-by-side

added added

removed removed

playground/demo-shell/demo_renderer.cpp

152

152

153

153

static const GLchar inverse_fshader[] =

154

154

{

155

"#ifdef GL_ES\n"

155

156

"precision mediump float;\n"

157

"#endif\n"

156

158

"uniform sampler2D tex;\n"

157

159

"uniform float alpha;\n"

158

160

"varying vec2 v_texcoord;\n"

164

166

};

165

167

static const GLchar contrast_fshader[] =

166

168

{

169

"#ifdef GL_ES\n"

167

170

"precision mediump float;\n"

171

"#endif\n"

168

172

"uniform sampler2D tex;\n"

169

173

"uniform float alpha;\n"

170

174

"varying vec2 v_texcoord;\n"

Older »