diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-25 16:21:07 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-25 16:21:07 +0000 |
| commit | c3c5652602ae5dff447cd382ff677fc690cae4e1 (patch) | |
| tree | 378f73d711662b1843c80e74c1083780903116c8 | |
| parent | e1998baef8a7007fcb1ece4ff2ac440a715487c7 (diff) | |
comments
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_mipmap_tree.h | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_pixel.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_regions.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_span.c | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h index f078ca1305..0d009d800c 100644 --- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h @@ -57,6 +57,9 @@ */ +/** + * Describes the location of each texture image within a texture region. + */ struct intel_mipmap_offset { GLuint offset; GLuint width; @@ -74,7 +77,7 @@ struct intel_mipmap_tree { GLuint first_level; GLuint last_level; - GLuint width0, height0, depth0; + GLuint width0, height0, depth0; /**< Level zero image dimensions */ GLuint cpp; GLboolean compressed; diff --git a/src/mesa/drivers/dri/i915/intel_pixel.c b/src/mesa/drivers/dri/i915/intel_pixel.c index 2c7ad23b74..83c65951b9 100644 --- a/src/mesa/drivers/dri/i915/intel_pixel.c +++ b/src/mesa/drivers/dri/i915/intel_pixel.c @@ -43,7 +43,7 @@ GLboolean intel_check_blit_fragment_ops( GLcontext *ctx ) if (ctx->NewState) _mesa_update_state(ctx); - /* Scissor could be done with the blitter: + /* XXX Note: Scissor could be done with the blitter: */ return !(ctx->_ImageTransferState || ctx->Color.AlphaEnabled || diff --git a/src/mesa/drivers/dri/i915/intel_regions.c b/src/mesa/drivers/dri/i915/intel_regions.c index b34954f08e..f2932fd004 100644 --- a/src/mesa/drivers/dri/i915/intel_regions.c +++ b/src/mesa/drivers/dri/i915/intel_regions.c @@ -145,7 +145,9 @@ struct intel_region *intel_region_create_static( struct intel_context *intel, - +/* + * XXX Move this into core Mesa? + */ static void _mesa_copy_rect( GLubyte *dst, GLuint cpp, GLuint dst_pitch, diff --git a/src/mesa/drivers/dri/i915/intel_span.c b/src/mesa/drivers/dri/i915/intel_span.c index 6cba412860..cd4b30d217 100644 --- a/src/mesa/drivers/dri/i915/intel_span.c +++ b/src/mesa/drivers/dri/i915/intel_span.c @@ -185,6 +185,7 @@ intel_map_unmap_buffers(struct intel_context *intel, GLboolean map) for (j = 0; j < ctx->DrawBuffer->_NumColorDrawBuffers[i]; j++) { struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[i][j]; irb = intel_renderbuffer(rb); + /* XXX FBO: check irb != NULL to catch software RBs??? */ ASSERT(irb); if (irb->Base.Name != 0) { /* XXX FBO temporary test */ if (irb->region) { |