diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-25 08:24:51 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-25 08:24:51 +0100 |
| commit | e6432710d8a586386b3c7025e845cf4f80830da3 (patch) | |
| tree | a403fa86779a287c97f5605f9b4d455d662ece66 /mesalib/src/mesa/drivers/common | |
| parent | d3f0fe49b8cb29295f3e529cc699a2abde1515a1 (diff) | |
| download | vcxsrv-e6432710d8a586386b3c7025e845cf4f80830da3.tar.gz vcxsrv-e6432710d8a586386b3c7025e845cf4f80830da3.tar.bz2 vcxsrv-e6432710d8a586386b3c7025e845cf4f80830da3.zip | |
mesa git update 25 jan 2012
Diffstat (limited to 'mesalib/src/mesa/drivers/common')
| -rw-r--r-- | mesalib/src/mesa/drivers/common/driverfuncs.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/common/meta.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.c b/mesalib/src/mesa/drivers/common/driverfuncs.c index c6b42a21d..1df838173 100644 --- a/mesalib/src/mesa/drivers/common/driverfuncs.c +++ b/mesalib/src/mesa/drivers/common/driverfuncs.c @@ -119,8 +119,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver) driver->FreeTextureImageBuffer = _swrast_free_texture_image_buffer; driver->MapTextureImage = _swrast_map_teximage; driver->UnmapTextureImage = _swrast_unmap_teximage; - driver->MapTexture = NULL; - driver->UnmapTexture = NULL; driver->DrawTex = _mesa_meta_DrawTex; /* Vertex/fragment programs */ diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index 05cc712cf..aa5fef873 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -3131,6 +3131,11 @@ copy_tex_sub_image(struct gl_context *ctx, format = GL_RGBA; } + if (_mesa_is_format_integer_color(texImage->TexFormat)) { + _mesa_problem(ctx, "unsupported integer color copyteximage"); + return; + } + type = get_temp_image_type(ctx, format); bpp = _mesa_bytes_per_pixel(format, type); if (bpp <= 0) { |