commit 499a89d1e845fd88b13216cb91a35d1071a7aa72
author Jesse Barker <jesse.barker@linaro.org> Mon Dec 17 07:45:56 2012 -0800
committer Jesse Barker <jesse.barker@linaro.org> Mon Dec 17 07:45:56 2012 -0800
tree 5c7a416d0e130ad3dd2303af38348e43be0f5b15
parent 54de949c6af7d22e6e04bb5e3239a6c9fb363f10
parent 3c0e8e2aefca4b74e6d387118c67b7bbe3622001

Merge of lp:~glmark2-dev/glmark2/refract

Adds new SceneRefract, which performs a two interface refraction through an
object, as well as a surface reflection.  The object (model), environment
(texture), and index of refraction of the object medium (index) are all
adjustable via command line options, but the default is to render the Stanford
Bunny against a background of the 'nasa1' texture with a refractive index of
1.2; the medium surrounding the object is assumed to be air/vacuum (index==1.0).

src/canvas-x11-egl.cpp

diff --git a/src/canvas-x11-egl.cpp b/src/canvas-x11-egl.cpp
index 0844b74..f7e548b 100644
--- a/src/canvas-x11-egl.cpp
+++ b/src/canvas-x11-egl.cpp
@@ -34,8 +34,7 @@
 bool
 CanvasX11EGL::init_gl_winsys()
 {
-    egl_.init_display(reinterpret_cast<EGLNativeDisplayType>(xdpy_),
-                      visual_config_);
+    egl_.init_display(xdpy_, visual_config_);
     return true;
 }
 
@@ -68,7 +67,7 @@
 bool
 CanvasX11EGL::make_current()
 {
-    egl_.init_surface(reinterpret_cast<EGLNativeWindowType>(xwin_));
+    egl_.init_surface(xwin_);
     if (!egl_.valid()) {
         Log::error("CanvasX11EGL: Invalid EGL state\n");
         return false;