Mesa (master): ilo: remove intel_winsys_enable_reuse()

Chia-I Wu olv at kemper.freedesktop.org
Mon Mar 10 08:46:19 UTC 2014


Module: Mesa
Branch: master
Commit: f2aabecbb05daf62c773f8c04819433e980d51dc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2aabecbb05daf62c773f8c04819433e980d51dc

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Sat Mar  8 13:50:53 2014 +0800

ilo: remove intel_winsys_enable_reuse()

It should be an (winsys) implementation detail.

---

 src/gallium/drivers/ilo/ilo_screen.c            |    2 --
 src/gallium/winsys/intel/drm/intel_drm_winsys.c |    9 ++-------
 src/gallium/winsys/intel/intel_winsys.h         |    5 +----
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c
index 7323c3e..5d1243d 100644
--- a/src/gallium/drivers/ilo/ilo_screen.c
+++ b/src/gallium/drivers/ilo/ilo_screen.c
@@ -729,8 +729,6 @@ ilo_screen_create(struct intel_winsys *ws)
 
    is->winsys = ws;
 
-   intel_winsys_enable_reuse(is->winsys);
-
    info = intel_winsys_get_info(is->winsys);
    if (!init_dev(&is->dev, info)) {
       FREE(is);
diff --git a/src/gallium/winsys/intel/drm/intel_drm_winsys.c b/src/gallium/winsys/intel/drm/intel_drm_winsys.c
index d7ec919..fae47ea 100644
--- a/src/gallium/winsys/intel/drm/intel_drm_winsys.c
+++ b/src/gallium/winsys/intel/drm/intel_drm_winsys.c
@@ -1,7 +1,7 @@
 /*
  * Mesa 3-D graphics library
  *
- * Copyright (C) 2012-2013 LunarG, Inc.
+ * Copyright (C) 2012-2014 LunarG, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -144,6 +144,7 @@ intel_winsys_create_for_fd(int fd)
    }
 
    drm_intel_bufmgr_gem_enable_fenced_relocs(winsys->bufmgr);
+   drm_intel_bufmgr_gem_enable_reuse(winsys->bufmgr);
 
    return winsys;
 }
@@ -164,12 +165,6 @@ intel_winsys_get_info(const struct intel_winsys *winsys)
    return &winsys->info;
 }
 
-void
-intel_winsys_enable_reuse(struct intel_winsys *winsys)
-{
-   drm_intel_bufmgr_gem_enable_reuse(winsys->bufmgr);
-}
-
 struct intel_context *
 intel_winsys_create_context(struct intel_winsys *winsys)
 {
diff --git a/src/gallium/winsys/intel/intel_winsys.h b/src/gallium/winsys/intel/intel_winsys.h
index 89df2a1..8cfbb49 100644
--- a/src/gallium/winsys/intel/intel_winsys.h
+++ b/src/gallium/winsys/intel/intel_winsys.h
@@ -1,7 +1,7 @@
 /*
  * Mesa 3-D graphics library
  *
- * Copyright (C) 2012-2013 LunarG, Inc.
+ * Copyright (C) 2012-2014 LunarG, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -88,9 +88,6 @@ intel_winsys_destroy(struct intel_winsys *winsys);
 const struct intel_winsys_info *
 intel_winsys_get_info(const struct intel_winsys *winsys);
 
-void
-intel_winsys_enable_reuse(struct intel_winsys *winsys);
-
 struct intel_context *
 intel_winsys_create_context(struct intel_winsys *winsys);
 




More information about the mesa-commit mailing list