diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-02-28 22:30:58 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-02-28 22:30:58 +0000 |
| commit | 4923e1926ad7b7eb7de017eda8e7db64d357e5c8 (patch) | |
| tree | 7bd9696c56a62747e9e7c7d57295ca315dba0922 /src/mesa/main/convolve.c | |
| parent | 94f9d4c0dd2b62e01032c2b0dd9b8a25466690c2 (diff) | |
| download | external_mesa3d-4923e1926ad7b7eb7de017eda8e7db64d357e5c8.zip external_mesa3d-4923e1926ad7b7eb7de017eda8e7db64d357e5c8.tar.gz external_mesa3d-4923e1926ad7b7eb7de017eda8e7db64d357e5c8.tar.bz2 | |
Remove clamp parameter from _mesa_unpack_color_span_float(). Pass the
IMAGE_CLAMP_BIT if needed.
Added ClampVertexColors and ClampFragmentColors to GLcontext in anticipation
of upcoming extensions (not fully used yet).
Diffstat (limited to 'src/mesa/main/convolve.c')
| -rw-r--r-- | src/mesa/main/convolve.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c index edb0248..c1965c5 100644 --- a/src/mesa/main/convolve.c +++ b/src/mesa/main/convolve.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 5.1 + * Version: 6.1 * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -146,7 +146,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G _mesa_unpack_color_span_float(ctx, width, GL_RGBA, ctx->Convolution1D.Filter, format, type, image, &ctx->Unpack, - 0, GL_FALSE); + 0); /* transferOps */ /* apply scale and bias */ { @@ -229,7 +229,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G GLfloat *dst = ctx->Convolution2D.Filter + i * width * 4; _mesa_unpack_color_span_float(ctx, width, GL_RGBA, dst, format, type, src, &ctx->Unpack, - 0, GL_FALSE); + 0); /* transferOps */ } /* apply scale and bias */ @@ -810,7 +810,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs _mesa_unpack_color_span_float(ctx, width, GL_RGBA, ctx->Separable2D.Filter, format, type, row, &ctx->Unpack, - 0, GL_FALSE); + 0); /* transferOps */ /* apply scale and bias */ { @@ -837,7 +837,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs _mesa_unpack_color_span_float(ctx, width, GL_RGBA, &ctx->Separable2D.Filter[colStart], format, type, column, &ctx->Unpack, - 0, GL_FALSE); + 0); /* transferOps */ /* apply scale and bias */ { |