xserver: Branch 'master' - 2 commits

[Keith Packard]

 glamor/glamor_core.c |    2 +-
 glamor/glamor_egl.c  |    6 +++++-
 glamor/glamor_priv.h |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 00f79416b19f0cde68291aced44ab07b9b76f7b8
Author: Jonathan Gray <jsg at jsg.id.au>
Date:   Wed Apr 15 21:29:58 2015 +1000

    glamor: fix build when DRI3 is not defined
    
    Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 6033780..dc54561 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -595,6 +595,7 @@ glamor_egl_close_screen(ScreenPtr screen)
     return screen->CloseScreen(screen);
 }
 
+#ifdef DRI3
 static int
 glamor_dri3_open_client(ClientPtr client,
                         ScreenPtr screen,
@@ -651,12 +652,12 @@ static dri3_screen_info_rec glamor_dri3_info = {
     .pixmap_from_fd = glamor_pixmap_from_fd,
     .fd_from_pixmap = glamor_fd_from_pixmap,
 };
+#endif /* DRI3 */
 
 void
 glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
 {
     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
-    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
     struct glamor_egl_screen_private *glamor_egl =
         glamor_egl_get_screen_private(scrn);
 
@@ -668,7 +669,9 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
 
     glamor_ctx->make_current = glamor_egl_make_current;
 
+#ifdef DRI3
     if (glamor_egl->dri3_capable) {
+    	glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
         /* Tell the core that we have the interfaces for import/export
          * of pixmaps.
          */
@@ -691,6 +694,7 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
             }
         }
     }
+#endif
 }
 
 static void
commit 7c609c911a3a33b7e4ddad46b8fc42878a073ee7
Author: Jonathan Gray <jsg at jsg.id.au>
Date:   Wed Apr 15 21:29:07 2015 +1000

    glamor: remove const from the return type of glamor_get_drawable_location()
    
    Fixes a build error with gcc 4.2.1 on OpenBSD due to
    -Werror=return-type from xorg-macros.
    
    error: type qualifiers ignored on function return type
    
    Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
index 5517454..965024e 100644
--- a/glamor/glamor_core.c
+++ b/glamor/glamor_core.c
@@ -35,7 +35,7 @@
 
 #include "glamor_priv.h"
 
-const Bool
+Bool
 glamor_get_drawable_location(const DrawablePtr drawable)
 {
     PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 898a934..4b9ba4d 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -676,7 +676,7 @@ glamor_pixmap_fbo *glamor_create_fbo_array(glamor_screen_private *glamor_priv,
 void glamor_init_finish_access_shaders(ScreenPtr screen);
 void glamor_fini_finish_access_shaders(ScreenPtr screen);
 
-const Bool glamor_get_drawable_location(const DrawablePtr drawable);
+Bool glamor_get_drawable_location(const DrawablePtr drawable);
 void glamor_get_drawable_deltas(DrawablePtr drawable, PixmapPtr pixmap,
                                 int *x, int *y);
 GLint glamor_compile_glsl_prog(GLenum type, const char *source);