diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-03 11:46:28 -0600 | 
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-03 11:46:28 -0600 | 
| commit | 5cd7042088bdd0b5d9a92f4fc927029a46a23734 (patch) | |
| tree | 3051b56421931a797f41a3909bd192556fd48fcd /src | |
| parent | 2db37ef659a43267dcb4c7a3c69b410a60a2a5d6 (diff) | |
swrast: wrap comment to 80 columns, remove dead code
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/swrast/s_drawpix.c | 63 | 
1 files changed, 6 insertions, 57 deletions
| diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index d31c402eea..6970b2e9cb 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -831,11 +831,13 @@ _swrast_DrawPixels( GLcontext *ctx,     SWcontext *swrast = SWRAST_CONTEXT(ctx);     GLboolean save_vp_override = ctx->VertexProgram._Overriden; -   /* We are creating fragments directly, without going through vertex programs. +   /* We are creating fragments directly, without going through vertex +    * programs.      * -    * This override flag tells the fragment processing code that its input comes -    * from a non-standard source, and it may therefore not rely on optimizations -    * that assume e.g. constant color if there is no color vertex array. +    * This override flag tells the fragment processing code that its input +    * comes from a non-standard source, and it may therefore not rely on +    * optimizations that assume e.g. constant color if there is no color +    * vertex array.      */     _mesa_set_vp_override(ctx, GL_TRUE); @@ -894,56 +896,3 @@ _swrast_DrawPixels( GLcontext *ctx,     _mesa_unmap_pbo_source(ctx, unpack);  } - - - -#if 0  /* experimental */ -/* - * Execute glDrawDepthPixelsMESA(). - */ -void -_swrast_DrawDepthPixelsMESA( GLcontext *ctx, -                             GLint x, GLint y, -                             GLsizei width, GLsizei height, -                             GLenum colorFormat, GLenum colorType, -                             const GLvoid *colors, -                             GLenum depthType, const GLvoid *depths, -                             const struct gl_pixelstore_attrib *unpack ) -{ -   SWcontext *swrast = SWRAST_CONTEXT(ctx); - -   if (swrast->NewState) -      _swrast_validate_derived( ctx ); - -   swrast_render_start(ctx); - -   switch (colorFormat) { -   case GL_COLOR_INDEX: -      if (ctx->Visual.rgbMode) -	 draw_rgba_pixels(ctx, x,y, width, height, colorFormat, colorType, -                          unpack, colors); -      else -	 draw_index_pixels(ctx, x, y, width, height, colorType, -                           unpack, colors); -      break; -   case GL_RED: -   case GL_GREEN: -   case GL_BLUE: -   case GL_ALPHA: -   case GL_LUMINANCE: -   case GL_LUMINANCE_ALPHA: -   case GL_RGB: -   case GL_BGR: -   case GL_RGBA: -   case GL_BGRA: -   case GL_ABGR_EXT: -      draw_rgba_pixels(ctx, x, y, width, height, colorFormat, colorType, -                       unpack, colors); -      break; -   default: -      _mesa_problem(ctx, "unexpected format in glDrawDepthPixelsMESA"); -   } - -   swrast_render_finish(ctx); -} -#endif | 
