projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Emit zero initialization for NV VP temporaries as required.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
intel
/
intel_screen.h
diff --git
a/src/mesa/drivers/dri/intel/intel_screen.h
b/src/mesa/drivers/dri/intel/intel_screen.h
index c1bf5bf8d38468728efdc7b8ff5d97b35d3fee5c..a9b9e109a6aeec05838e0900471dd248c466f192 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_screen.h
+++ b/
src/mesa/drivers/dri/intel/intel_screen.h
@@
-30,7
+30,8
@@
#include <sys/time.h>
#include "dri_util.h"
#include <sys/time.h>
#include "dri_util.h"
-#include "i830_common.h"
+#include "intel_bufmgr.h"
+#include "i915_drm.h"
#include "xmlconfig.h"
/* XXX: change name or eliminate to avoid conflict with "struct
#include "xmlconfig.h"
/* XXX: change name or eliminate to avoid conflict with "struct
@@
-42,7
+43,6
@@
typedef struct
drmSize size; /* region size in bytes */
char *map; /* memory map */
int offset; /* from start of video mem, in bytes */
drmSize size; /* region size in bytes */
char *map; /* memory map */
int offset; /* from start of video mem, in bytes */
- int pitch; /* row stride, in bytes */
unsigned int bo_handle; /* buffer object id if available, or -1 */
/**
* Flags if the region is tiled.
unsigned int bo_handle; /* buffer object id if available, or -1 */
/**
* Flags if the region is tiled.
@@
-56,28
+56,30
@@
typedef struct
{
intelRegion front;
intelRegion back;
{
intelRegion front;
intelRegion back;
- intelRegion third;
intelRegion depth;
intelRegion tex;
int deviceID;
int width;
int height;
intelRegion depth;
intelRegion tex;
int deviceID;
int width;
int height;
- int mem; /* unused */
-
- int cpp; /* for front and back buffers */
-/* int bitsPerPixel; */
- int fbFormat; /* XXX FBO: this is obsolete - remove after i830 updates */
+ int pitch; /* common row stride, in pixels */
int logTextureGranularity;
__DRIscreenPrivate *driScrnPriv;
int logTextureGranularity;
__DRIscreenPrivate *driScrnPriv;
- unsigned int sarea_priv_offset;
+
+ volatile drm_i915_sarea_t *sarea;
int drmMinor;
int irq_active;
int drmMinor;
int irq_active;
- int allow_batchbuffer;
+
+ GLboolean no_hw;
+
+ GLboolean no_vbo;
+ int ttm;
+ dri_bufmgr *bufmgr;
+ GLboolean kernel_exec_fencing;
/**
* Configuration cache with default values for all contexts
/**
* Configuration cache with default values for all contexts
@@
-91,10
+93,6
@@
extern GLboolean intelMapScreenRegions(__DRIscreenPrivate * sPriv);
extern void intelUnmapScreenRegions(intelScreenPrivate * intelScreen);
extern void intelUnmapScreenRegions(intelScreenPrivate * intelScreen);
-extern void
-intelUpdateScreenFromSAREA(intelScreenPrivate * intelScreen,
- drmI830Sarea * sarea);
-
extern void intelDestroyContext(__DRIcontextPrivate * driContextPriv);
extern GLboolean intelUnbindContext(__DRIcontextPrivate * driContextPriv);
extern void intelDestroyContext(__DRIcontextPrivate * driContextPriv);
extern GLboolean intelUnbindContext(__DRIcontextPrivate * driContextPriv);
@@
-104,11
+102,6
@@
intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
__DRIdrawablePrivate * driDrawPriv,
__DRIdrawablePrivate * driReadPriv);
__DRIdrawablePrivate * driDrawPriv,
__DRIdrawablePrivate * driReadPriv);
-extern void intelSwapBuffers(__DRIdrawablePrivate * dPriv);
-
-extern void
-intelCopySubBuffer(__DRIdrawablePrivate * dPriv, int x, int y, int w, int h);
-
extern struct intel_context *intelScreenContext(intelScreenPrivate *intelScreen);
#endif
extern struct intel_context *intelScreenContext(intelScreenPrivate *intelScreen);
#endif