summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/dri/intel/intel_context.h
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@tungstengraphics.com>2008-06-06 14:49:02 +0200
committerJakob Bornecrantz <jakob@tungstengraphics.com>2008-06-06 14:49:02 +0200
commitadbdabb85ae322d5c80cadcee931e36d5c688d98 (patch)
tree9274a42def079ecf97e7dff782e8196af4a5c246 /src/gallium/winsys/dri/intel/intel_context.h
parent18953a8771054f02f9a9bef08bf323e19086fdac (diff)
i915: Moved pipe_buffer and i915_winsys functions to a common folder
Diffstat (limited to 'src/gallium/winsys/dri/intel/intel_context.h')
-rw-r--r--src/gallium/winsys/dri/intel/intel_context.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/gallium/winsys/dri/intel/intel_context.h b/src/gallium/winsys/dri/intel/intel_context.h
index 597dc13830..ced18da143 100644
--- a/src/gallium/winsys/dri/intel/intel_context.h
+++ b/src/gallium/winsys/dri/intel/intel_context.h
@@ -1,8 +1,8 @@
/**************************************************************************
- *
+ *
* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
* All Rights Reserved.
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -10,11 +10,11 @@
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
@@ -22,7 +22,7 @@
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
**************************************************************************/
#ifndef INTEL_CONTEXT_H
@@ -36,6 +36,8 @@
#include "intel_screen.h"
#include "i915_drm.h"
+#include "intel_drm/intel_be_context.h"
+
struct pipe_context;
struct intel_context;
@@ -50,12 +52,13 @@ struct st_context;
*/
struct intel_context
{
+ struct intel_be_context base;
struct st_context *st;
struct _DriFenceObject *last_swap_fence;
struct _DriFenceObject *first_swap_fence;
- struct intel_batchbuffer *batch;
+// struct intel_batchbuffer *batch;
boolean locked;
char *prevLockFile;
@@ -123,7 +126,7 @@ extern int __intel_debug;
} while(0)
#else
-#define DBG(flag, ...)
+#define DBG(flag, ...)
#endif