137 lines
5.3 KiB
Diff
137 lines
5.3 KiB
Diff
diff --git a/src/mesa/drivers/dri/intel/intel_buffers.c b/src/mesa/drivers/dri/intel/intel_buffers.c
|
|
index f8f009c..4d036de 100644
|
|
--- a/src/mesa/drivers/dri/intel/intel_buffers.c
|
|
+++ b/src/mesa/drivers/dri/intel/intel_buffers.c
|
|
@@ -181,7 +181,7 @@ intelUpdatePageFlipping(struct intel_context *intel,
|
|
intel_fb->pf_current_page = (intel->sarea->pf_current_page >>
|
|
(intel_fb->pf_planes & 0x2)) & 0x3;
|
|
|
|
- intel_fb->pf_num_pages = intel->intelScreen->third.handle ? 3 : 2;
|
|
+ intel_fb->pf_num_pages = 2;
|
|
|
|
pf_active = pf_planes && (pf_planes & intel->sarea->pf_active) == pf_planes;
|
|
|
|
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
|
|
index 6c625b4..6ff98e9 100644
|
|
--- a/src/mesa/drivers/dri/intel/intel_context.c
|
|
+++ b/src/mesa/drivers/dri/intel/intel_context.c
|
|
@@ -775,7 +775,6 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
|
|
|
|
intel_region_release(&intel->front_region);
|
|
intel_region_release(&intel->back_region);
|
|
- intel_region_release(&intel->third_region);
|
|
intel_region_release(&intel->depth_region);
|
|
|
|
driDestroyOptionCache(&intel->optionCache);
|
|
@@ -825,12 +824,7 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
|
|
intel_renderbuffer_set_region(intel_fb->color_rb[1],
|
|
intel->back_region);
|
|
}
|
|
-#if 0
|
|
- if (intel_fb->color_rb[2]) {
|
|
- intel_renderbuffer_set_region(intel_fb->color_rb[2],
|
|
- intel->third_region);
|
|
- }
|
|
-#endif
|
|
+
|
|
if (irbDepth) {
|
|
intel_renderbuffer_set_region(irbDepth, intel->depth_region);
|
|
}
|
|
@@ -867,7 +861,7 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
|
|
driDrawableInitVBlank(driDrawPriv);
|
|
intel_fb->vbl_waited = driDrawPriv->vblSeq;
|
|
|
|
- for (i = 0; i < (intel->intelScreen->third.handle ? 3 : 2); i++) {
|
|
+ for (i = 0; i < 2; i++) {
|
|
if (intel_fb->color_rb[i])
|
|
intel_fb->color_rb[i]->vbl_pending = driDrawPriv->vblSeq;
|
|
}
|
|
diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
|
|
index ee43ed7..ac08117 100644
|
|
--- a/src/mesa/drivers/dri/intel/intel_context.h
|
|
+++ b/src/mesa/drivers/dri/intel/intel_context.h
|
|
@@ -166,7 +166,6 @@ struct intel_context
|
|
|
|
struct intel_region *front_region;
|
|
struct intel_region *back_region;
|
|
- struct intel_region *third_region;
|
|
struct intel_region *depth_region;
|
|
|
|
/**
|
|
diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
|
|
index 8dbcc30..51ce32a 100644
|
|
--- a/src/mesa/drivers/dri/intel/intel_regions.c
|
|
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
|
|
@@ -550,15 +550,6 @@ intel_recreate_static_regions(struct intel_context *intel)
|
|
intel->back_region,
|
|
&intelScreen->back);
|
|
|
|
-#ifdef I915
|
|
- if (intelScreen->third.handle) {
|
|
- intel->third_region =
|
|
- intel_recreate_static(intel, "third",
|
|
- intel->third_region,
|
|
- &intelScreen->third);
|
|
- }
|
|
-#endif /* I915 */
|
|
-
|
|
/* Still assumes front.cpp == depth.cpp. We can kill this when we move to
|
|
* private buffers.
|
|
*/
|
|
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
|
|
index 61b55b9..fc4e82b 100644
|
|
--- a/src/mesa/drivers/dri/intel/intel_screen.c
|
|
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
|
|
@@ -177,13 +177,6 @@ intelUpdateScreenFromSAREA(intelScreenPrivate * intelScreen,
|
|
intelScreen->back.size = sarea->back_size;
|
|
intelScreen->back.tiled = sarea->back_tiled;
|
|
|
|
- if (intelScreen->driScrnPriv->ddx_version.minor >= 8) {
|
|
- intelScreen->third.offset = sarea->third_offset;
|
|
- intelScreen->third.handle = sarea->third_handle;
|
|
- intelScreen->third.size = sarea->third_size;
|
|
- intelScreen->third.tiled = sarea->third_tiled;
|
|
- }
|
|
-
|
|
intelScreen->depth.offset = sarea->depth_offset;
|
|
intelScreen->depth.handle = sarea->depth_handle;
|
|
intelScreen->depth.size = sarea->depth_size;
|
|
@@ -192,12 +185,10 @@ intelUpdateScreenFromSAREA(intelScreenPrivate * intelScreen,
|
|
if (intelScreen->driScrnPriv->ddx_version.minor >= 9) {
|
|
intelScreen->front.bo_handle = sarea->front_bo_handle;
|
|
intelScreen->back.bo_handle = sarea->back_bo_handle;
|
|
- intelScreen->third.bo_handle = sarea->third_bo_handle;
|
|
intelScreen->depth.bo_handle = sarea->depth_bo_handle;
|
|
} else {
|
|
intelScreen->front.bo_handle = -1;
|
|
intelScreen->back.bo_handle = -1;
|
|
- intelScreen->third.bo_handle = -1;
|
|
intelScreen->depth.bo_handle = -1;
|
|
}
|
|
|
|
@@ -353,12 +344,6 @@ intelCreateBuffer(__DRIscreenPrivate * driScrnPriv,
|
|
_mesa_add_renderbuffer(&intel_fb->Base, BUFFER_BACK_LEFT,
|
|
&intel_fb->color_rb[1]->Base);
|
|
|
|
- if (screen->third.handle) {
|
|
- struct gl_renderbuffer *tmp_rb = NULL;
|
|
-
|
|
- intel_fb->color_rb[2] = intel_create_renderbuffer(rgbFormat);
|
|
- _mesa_reference_renderbuffer(&tmp_rb, &intel_fb->color_rb[2]->Base);
|
|
- }
|
|
}
|
|
|
|
if (mesaVis->depthBits == 24) {
|
|
diff --git a/src/mesa/drivers/dri/intel/intel_screen.h b/src/mesa/drivers/dri/intel/intel_screen.h
|
|
index 91f0d6d..cf5359b 100644
|
|
--- a/src/mesa/drivers/dri/intel/intel_screen.h
|
|
+++ b/src/mesa/drivers/dri/intel/intel_screen.h
|
|
@@ -56,7 +56,6 @@ typedef struct
|
|
{
|
|
intelRegion front;
|
|
intelRegion back;
|
|
- intelRegion third;
|
|
intelRegion depth;
|
|
intelRegion tex;
|
|
|