aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i915tex/server
diff options
context:
space:
mode:
authorJesse Barnes <[email protected]>2007-09-11 03:54:34 -0700
committerJesse Barnes <[email protected]>2007-09-11 03:54:34 -0700
commit78b7e49c846c535f6907c18a9982d07c9e9feabb (patch)
tree89d2b011b5eea45435216db45868dda0a03ee782 /src/mesa/drivers/dri/i915tex/server
parent249ca55555beea76c63a5f5dd09d35aa45efa180 (diff)
intel: disentangle planes & pipes
This is the Mesa portion of the pipe & plane disambiguation. Mesa needs to use the new assumptions about plane vs. pipe mappings and should use the new SAREA field names to avoid confusion.
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/server')
-rw-r--r--src/mesa/drivers/dri/i915tex/server/i830_common.h19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i915tex/server/i830_common.h b/src/mesa/drivers/dri/i915tex/server/i830_common.h
index d4d58886ce0..07cc63f6631 100644
--- a/src/mesa/drivers/dri/i915tex/server/i830_common.h
+++ b/src/mesa/drivers/dri/i915tex/server/i830_common.h
@@ -121,14 +121,17 @@ typedef struct {
unsigned int rotated_tiled;
unsigned int rotated2_tiled;
- int pipeA_x;
- int pipeA_y;
- int pipeA_w;
- int pipeA_h;
- int pipeB_x;
- int pipeB_y;
- int pipeB_w;
- int pipeB_h;
+ int planeA_x;
+ int planeA_y;
+ int planeA_w;
+ int planeA_h;
+ int planeB_x;
+ int planeB_y;
+ int planeB_w;
+ int planeB_h;
+
+ int planeA_pipe;
+ int planeB_pipe;
/* Triple buffering */
drm_handle_t third_handle;