diff options
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/intel_winsys/Makefile | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel_winsys/intel_buffers.c | 3 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel_winsys/intel_fbo.c | 5 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel_winsys/intel_fbo.h | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel_winsys/intel_screen.c | 8 |
5 files changed, 19 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/Makefile b/src/mesa/drivers/dri/intel_winsys/Makefile index ff635eb44d9..8d3d17e13ee 100644 --- a/src/mesa/drivers/dri/intel_winsys/Makefile +++ b/src/mesa/drivers/dri/intel_winsys/Makefile @@ -23,9 +23,10 @@ DRIVER_SOURCES = \ intel_screen.c \ intel_surface.c \ intel_fbo.c \ - intel_depthstencil.c \ intel_batchpool.c +UNUSED = intel_depthstencil.c + C_SOURCES = \ $(COMMON_SOURCES) \ $(COMMON_BM_SOURCES) \ diff --git a/src/mesa/drivers/dri/intel_winsys/intel_buffers.c b/src/mesa/drivers/dri/intel_winsys/intel_buffers.c index 3cece980796..ce217ceb568 100644 --- a/src/mesa/drivers/dri/intel_winsys/intel_buffers.c +++ b/src/mesa/drivers/dri/intel_winsys/intel_buffers.c @@ -41,6 +41,7 @@ #include "pipe/p_context.h" + /* This block can be removed when libdrm >= 2.3.1 is required */ #ifndef DRM_VBLANK_FLIP @@ -275,6 +276,7 @@ intelWindowMoved(struct intel_context *intel) /* Emit wait for pending flips */ +#if 0 void intel_wait_flips(struct intel_context *intel, GLuint batch_flags) { @@ -301,6 +303,7 @@ intel_wait_flips(struct intel_context *intel, GLuint batch_flags) intel_rb->pf_pending--; } } +#endif #if 0 /* Flip the front & back buffers diff --git a/src/mesa/drivers/dri/intel_winsys/intel_fbo.c b/src/mesa/drivers/dri/intel_winsys/intel_fbo.c index 0b6c6a94ee5..7b9bef73bda 100644 --- a/src/mesa/drivers/dri/intel_winsys/intel_fbo.c +++ b/src/mesa/drivers/dri/intel_winsys/intel_fbo.c @@ -148,10 +148,11 @@ intel_delete_renderbuffer(struct gl_renderbuffer *rb) DBG("freeing renderbuffer\n"); +#if 0 if (irb->PairedStencil || irb->PairedDepth) { intel_unpair_depth_stencil(ctx, irb); } - +#endif if (intel && irb->region) { intel->pipe->region_release(intel->pipe, &irb->region); } @@ -511,7 +512,9 @@ intel_wrap_texture(GLcontext * ctx, struct gl_texture_image *texImage) // intel_set_span_functions(&irb->Base); +#if 0 irb->RenderToTexture = GL_TRUE; +#endif return irb; } diff --git a/src/mesa/drivers/dri/intel_winsys/intel_fbo.h b/src/mesa/drivers/dri/intel_winsys/intel_fbo.h index 0f99a3e98db..35587f364a1 100644 --- a/src/mesa/drivers/dri/intel_winsys/intel_fbo.h +++ b/src/mesa/drivers/dri/intel_winsys/intel_fbo.h @@ -77,6 +77,7 @@ struct intel_renderbuffer { struct gl_renderbuffer Base; struct pipe_region *region; +#if 0 void *pfMap; /* possibly paged flipped map pointer */ GLuint pfPitch; /* possibly paged flipped pitch */ GLboolean RenderToTexture; /* RTT? */ @@ -85,6 +86,7 @@ struct intel_renderbuffer GLuint PairedStencil; /**< only used if this is a stencil renderbuffer */ GLuint pf_pending; /**< sequence number of pending flip */ +#endif GLuint vbl_pending; /**< vblank sequence number of pending flip */ diff --git a/src/mesa/drivers/dri/intel_winsys/intel_screen.c b/src/mesa/drivers/dri/intel_winsys/intel_screen.c index 81ab435f42e..fba0c47e598 100644 --- a/src/mesa/drivers/dri/intel_winsys/intel_screen.c +++ b/src/mesa/drivers/dri/intel_winsys/intel_screen.c @@ -46,6 +46,7 @@ #include "dri_bufpool.h" #include "pipe/p_context.h" +#include "state_tracker/st_cb_fbo.h" @@ -308,10 +309,17 @@ intelCreateBuffer(__DRIscreenPrivate * driScrnPriv, } if (mesaVis->doubleBufferMode) { +#if 01 intel_fb->color_rb[1] = intel_new_renderbuffer_fb(rgbFormat); _mesa_add_renderbuffer(&intel_fb->Base, BUFFER_BACK_LEFT, &intel_fb->color_rb[1]->Base); +#else + intel_fb->color_rb[1] + = st_new_renderbuffer_fb(rgbFormat); + _mesa_add_renderbuffer(&intel_fb->Base, BUFFER_BACK_LEFT, + &intel_fb->color_rb[1]->Base); +#endif } if (mesaVis->depthBits == 24 && mesaVis->stencilBits == 8) { |