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

Author: Emil Velikov <emil.veli...@collabora.com>
Date:   Fri Oct 14 19:09:08 2016 +0100

i915: workaround multiple intelFenceExtension definitions

Due to conflicting symbol names (between i915 and i965) in the
megadriver, we use a set of defines in i915/intel_screen.h.

With a recent commit we've introduced a symbol intelFenceExtension which
has different implementation for each driver, yet we forgot to add the
define.

Fixes: d11515ff1b3 ("i915/sync: Implement DRI2_Fence extension")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98264
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/mesa/drivers/dri/i915/intel_screen.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/drivers/dri/i915/intel_screen.h 
b/src/mesa/drivers/dri/i915/intel_screen.h
index 891894d..11e1a3f 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.h
+++ b/src/mesa/drivers/dri/i915/intel_screen.h
@@ -156,6 +156,7 @@ struct intel_screen
 #define intel_get_rb_region                 old_intel_get_rb_region
 #define intel_renderbuffer_set_draw_offset  
old_intel_renderbuffer_set_draw_offset
 #define intel_miptree_create_for_image_buffer 
old_intel_miptree_create_for_image_buffer
+#define intelFenceExtension                 old_intelFenceExtension
 
 extern void intelDestroyContext(__DRIcontext * driContextPriv);
 

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to