diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-17 09:07:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-17 09:07:57 +0100 |
| commit | 05accdf525b82a20be8e92789185d8537bc4ab81 (patch) | |
| tree | 05bc88963d29df95f0a7c63cad7ce773e093b632 /mesalib/src/mesa/main | |
| parent | 3e85e2f1e33380d6c9efe0972ed475cbf9dbe825 (diff) | |
| parent | 34c1e86406451a3604de4982339058088434ab40 (diff) | |
| download | vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.tar.gz vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.tar.bz2 vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/format_pack.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/version.c | 6 |
2 files changed, 3 insertions, 5 deletions
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 b4d462103..92ae9c659 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 && |