minor cleanups, disable debugging

This commit is contained in:
Roland Scheidegger 2007-07-20 11:33:24 +02:00
parent e0850e52ee
commit 97cd87ef74
6 changed files with 6 additions and 26 deletions

View file

@ -597,25 +597,6 @@ i830_set_draw_region(struct intel_context *intel,
i830_state_draw_region(intel, &i830->state, color_region, depth_region);
}
#if 0
static void
i830_update_color_z_regions(intelContextPtr intel,
const intelRegion * colorRegion,
const intelRegion * depthRegion)
{
i830ContextPtr i830 = I830_CONTEXT(intel);
i830->state.Buffer[I830_DESTREG_CBUFADDR1] =
(BUF_3D_ID_COLOR_BACK | BUF_3D_PITCH(colorRegion->pitch) |
BUF_3D_USE_FENCE);
i830->state.Buffer[I830_DESTREG_CBUFADDR2] = colorRegion->offset;
i830->state.Buffer[I830_DESTREG_DBUFADDR1] =
(BUF_3D_ID_DEPTH | BUF_3D_PITCH(depthRegion->pitch) | BUF_3D_USE_FENCE);
i830->state.Buffer[I830_DESTREG_DBUFADDR2] = depthRegion->offset;
}
#endif
/* This isn't really handled at the moment.
*/

View file

@ -645,7 +645,7 @@ intelScheduleSwap(const __DRIdrawablePrivate * dPriv, GLboolean *missed_target)
return ret;
}
void
intelSwapBuffers(__DRIdrawablePrivate * dPriv)
{

View file

@ -703,8 +703,7 @@ intelContendedLock(struct intel_context *intel, GLuint flags)
}
/* Lock the hardware and validate our state.
/* Lock the hardware and validate our state.
*/
void LOCK_HARDWARE( struct intel_context *intel )
{

View file

@ -335,7 +335,7 @@ __memcpy(void *to, const void *from, size_t n)
/* ================================================================
* Debugging:
*/
#define DO_DEBUG 1
#define DO_DEBUG 0
#if DO_DEBUG
extern int INTEL_DEBUG;
#else

View file

@ -118,7 +118,7 @@ intel_recreate_static(intelScreenPrivate *intelScreen,
* Only used for real front buffer now.
*
* Note that these don't allocate video memory, just describe
* allocations alread made by the X server.
* allocations already made by the X server.
*/
static void
intel_recreate_static_regions(intelScreenPrivate *intelScreen)
@ -222,7 +222,7 @@ intelUpdateScreenFromSAREA(intelScreenPrivate * intelScreen,
intelScreen->front.handle = sarea->front_handle;
intelScreen->front.size = sarea->front_size;
if (1)
if (0)
intelPrintSAREA(sarea);
}

View file

@ -194,7 +194,7 @@ intelClearColor(GLcontext * ctx, const GLfloat color[4])
* Update the viewport transformation matrix. Depends on:
* - viewport pos/size
* - depthrange
* - window pos/size or FBO size
* - window size or FBO size
*/
static void
intelCalcViewport(GLcontext * ctx)