fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix merge conflicts

Browse source
This commit is contained in:
Brian 2007-08-09 15:42:12 -06:00
parent 0c4c86cf2c
commit fb8caffea8
2 changed files with 4 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/mesa/drivers/dri/intel_winsys/intel_buffers.c
View file

@ -90,41 +90,6 @@ intel_intersect_cliprects(drm_clip_rect_t * dst,
return GL_TRUE;
}
<<<<<<< HEAD:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
/**
* Return pointer to current color drawing region, or NULL.
*/
#if 0
struct pipe_region *
intel_drawbuf_region(struct intel_context *intel)
{
struct intel_renderbuffer *irbColor =
intel_renderbuffer(intel->ctx.DrawBuffer->_ColorDrawBuffers[0][0]);
if (irbColor)
return irbColor->Base.surface->region;
else
return NULL;
}
=======
>>>>>>> remove dead code, remove intel_fbo.h includes:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
<<<<<<< HEAD:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
/**
* Return pointer to current color reading region, or NULL.
*/
struct pipe_region *
intel_readbuf_region(struct intel_context *intel)
{
struct intel_renderbuffer *irb
= intel_renderbuffer(intel->ctx.ReadBuffer->_ColorReadBuffer);
if (irb)
return irb->Base.surface->region;
else
return NULL;
}
#endif
=======
>>>>>>> remove dead code, remove intel_fbo.h includes:src/mesa/drivers/dri/intel_winsys/intel_buffers.c
/**
* This will be called whenever the currently bound window is moved/resized.

6
src/mesa/drivers/dri/intel_winsys/intel_context.c
View file

@ -351,7 +351,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
/* Initialize the software rasterizer and helper modules. */
_vbo_CreateContext(ctx);
_tnl_CreateContext(ctx);
#if 0
/*
* Pipe-related setup
*/
@ -404,7 +404,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
default:
assert(0); /*FIX*/
}
#endif
/*
* memory pools
@ -465,6 +465,8 @@ intelCreateContext(const __GLcontextModes * mesaVis,
*/
if (!getenv("INTEL_HW")) {
intel->pipe = intel_create_softpipe( intel );
intel->pipe->surface_alloc = intel_new_surface;
intel->pipe->supported_formats = intel_supported_formats;
}
else {
switch (intel->intelScreen->deviceID) {