diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-30 06:43:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-30 06:43:04 +0000 |
| commit | 2039567395da75a3ae318fb82738cdcf2caa05a1 (patch) | |
| tree | 23caaf9e0f6867d85f5cffc284d008c591ae99cb /mesalib/src/mesa/main/colortab.c | |
| parent | 24abc56b37a3ec32a03b7eafccd96607ae13ea89 (diff) | |
| download | vcxsrv-2039567395da75a3ae318fb82738cdcf2caa05a1.tar.gz vcxsrv-2039567395da75a3ae318fb82738cdcf2caa05a1.tar.bz2 vcxsrv-2039567395da75a3ae318fb82738cdcf2caa05a1.zip | |
mesa git update 30 Mar 2011
Diffstat (limited to 'mesalib/src/mesa/main/colortab.c')
| -rw-r--r-- | mesalib/src/mesa/main/colortab.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/colortab.c b/mesalib/src/mesa/main/colortab.c index d0c865735..35b3096f6 100644 --- a/mesalib/src/mesa/main/colortab.c +++ b/mesalib/src/mesa/main/colortab.c @@ -516,6 +516,7 @@ _mesa_GetColorTable( GLenum target, GLenum format, struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx); struct gl_color_table *table = NULL; GLfloat rgba[MAX_COLOR_TABLE_SIZE][4]; + GLbitfield transferOps = 0; ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); if (ctx->NewState) { @@ -618,8 +619,12 @@ _mesa_GetColorTable( GLenum target, GLenum format, if (!data) return; + /* TODO: is this correct? */ + if(ctx->Color._ClampReadColor) + transferOps |= IMAGE_CLAMP_BIT; + _mesa_pack_rgba_span_float(ctx, table->Size, rgba, - format, type, data, &ctx->Pack, 0x0); + format, type, data, &ctx->Pack, transferOps); _mesa_unmap_pbo_dest(ctx, &ctx->Pack); } |