From 34c1e86406451a3604de4982339058088434ab40 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 17 Jan 2012 08:43:22 +0100 Subject: git update mesa pixman xserver 17 jan 2012 --- mesalib/src/mesa/main/format_pack.c | 2 +- mesalib/src/mesa/main/version.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'mesalib/src/mesa/main') diff --git a/mesalib/src/mesa/main/format_pack.c b/mesalib/src/mesa/main/format_pack.c index 0982c9af4..85b2c691c 100644 --- a/mesalib/src/mesa/main/format_pack.c +++ b/mesalib/src/mesa/main/format_pack.c @@ -636,7 +636,7 @@ pack_float_ARGB1555_REV(const GLfloat src[4], void *dst) static void pack_ubyte_AL44(const GLubyte src[4], void *dst) { - GLushort *d = ((GLushort *) dst); + GLubyte *d = ((GLubyte *) dst); *d = PACK_COLOR_44(src[ACOMP], src[RCOMP]); } diff --git a/mesalib/src/mesa/main/version.c b/mesalib/src/mesa/main/version.c index 49cdc3088..38ae1ce85 100644 --- a/mesalib/src/mesa/main/version.c +++ b/mesalib/src/mesa/main/version.c @@ -130,16 +130,14 @@ compute_version(struct gl_context *ctx) ctx->Extensions.ARB_half_float_pixel && ctx->Extensions.ARB_half_float_vertex && ctx->Extensions.ARB_map_buffer_range && + ctx->Extensions.ARB_shader_texture_lod && ctx->Extensions.ARB_texture_float && ctx->Extensions.ARB_texture_rg && ctx->Extensions.ARB_texture_compression_rgtc && ctx->Extensions.APPLE_vertex_array_object && ctx->Extensions.EXT_draw_buffers2 && - ctx->Extensions.EXT_framebuffer_blit && - ctx->Extensions.EXT_framebuffer_multisample && - ctx->Extensions.EXT_framebuffer_object && + ctx->Extensions.ARB_framebuffer_object && ctx->Extensions.EXT_framebuffer_sRGB && - ctx->Extensions.EXT_packed_depth_stencil && ctx->Extensions.EXT_packed_float && ctx->Extensions.EXT_texture_array && ctx->Extensions.EXT_texture_integer && -- cgit v1.2.3