i915: reference __DRI_ATTRIB_SWAP_COPY token over the GLX one

[mesa.git] / src / mesa / drivers / dri / i915 / intel_context.h

diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index 350d35d903322e1d779eec4af124c9ce60f34431..580af53f9568c8c6b20b09530b1245f0eaee1c00 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -32,24 +32,14 @@
 #include <stdbool.h>
 #include <string.h>
 #include "main/mtypes.h"
-#include "main/mm.h"
+#include "main/errors.h"
 
-#ifdef __cplusplus
-extern "C" {
-       /* Evil hack for using libdrm in a c++ compiler. */
-       #define virtual virt
-#endif
-
-#include "drm.h"
-#include "intel_bufmgr.h"
+#include <drm.h>
+#include <intel_bufmgr.h>
+#include <i915_drm.h>
 
 #include "intel_screen.h"
 #include "intel_tex_obj.h"
-#include "i915_drm.h"
-
-#ifdef __cplusplus
-       #undef virtual
-#endif
 
 #include "tnl/t_vertex.h"
 
@@ -105,13 +95,6 @@ extern void intelFallback(struct intel_context *intel, GLbitfield bit,
 #endif
 #endif
 
-struct intel_sync_object {
-   struct gl_sync_object Base;
-
-   /** Batch associated with this sync object */
-   drm_intel_bo *bo;
-};
-
 struct intel_batchbuffer {
    /** Current batchbuffer being queued up. */
    drm_intel_bo *bo;
@@ -255,26 +238,6 @@ struct intel_context
     */
    bool front_buffer_dirty;
 
-   /**
-    * Track whether front-buffer rendering is currently enabled
-    *
-    * A separate flag is used to track this in order to support MRT more
-    * easily.
-    */
-   bool is_front_buffer_rendering;
-   /**
-    * Track whether front-buffer is the current read target.
-    *
-    * This is closely associated with is_front_buffer_rendering, but may
-    * be set separately.  The DRI2 fake front buffer must be referenced
-    * either way.
-    */
-   bool is_front_buffer_reading;
-
-   bool use_early_z;
-
-   int driFd;
-
    __DRIcontext *driContext;
    struct intel_screen *intelScreen;
 
@@ -319,7 +282,11 @@ extern int INTEL_DEBUG;
 
 #ifdef HAVE_ANDROID_PLATFORM
 #define LOG_TAG "INTEL-MESA"
+#if ANDROID_API_LEVEL >= 26
+#include <log/log.h>
+#else
 #include <cutils/log.h>
+#endif /* use log/log.h start from android 8 major version */
 #ifndef ALOGW
 #define ALOGW LOGW
 #endif
@@ -457,7 +424,6 @@ extern int intel_translate_shadow_compare_func(GLenum func);
 extern int intel_translate_compare_func(GLenum func);
 extern int intel_translate_stencil_op(GLenum op);
 extern int intel_translate_blend_factor(GLenum factor);
-extern int intel_translate_logic_op(GLenum opcode);
 
 void intel_update_renderbuffers(__DRIcontext *context,
                                __DRIdrawable *drawable);
@@ -477,8 +443,4 @@ intel_context(struct gl_context * ctx)
    return (struct intel_context *) ctx;
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif