From 74aa773f7cbe456ca8f25c8a9a2c911795cc2a63 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 26 Jan 2010 11:35:30 +0800 Subject: docs: Mention EGL and OpenGL ES in 7.8 release notes. --- docs/relnotes-7.8.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/relnotes-7.8.html') diff --git a/docs/relnotes-7.8.html b/docs/relnotes-7.8.html index 717b96282c..4fcc491036 100644 --- a/docs/relnotes-7.8.html +++ b/docs/relnotes-7.8.html @@ -36,6 +36,8 @@ tbd -- cgit v1.2.3 From ab53f710151d920286d0c92f93262fb468008051 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 26 Jan 2010 14:43:23 -0800 Subject: i965: Add support for EXT_draw_buffers2. --- docs/relnotes-7.8.html | 2 +- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 4 ++-- src/mesa/drivers/dri/intel/intel_extensions.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'docs/relnotes-7.8.html') diff --git a/docs/relnotes-7.8.html b/docs/relnotes-7.8.html index 4fcc491036..6511d613d6 100644 --- a/docs/relnotes-7.8.html +++ b/docs/relnotes-7.8.html @@ -35,7 +35,7 @@ tbd

New features

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 357c8c90de..1db438ae7b 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -577,7 +577,7 @@ brw_update_renderbuffer_surface(struct brw_context *brw, key.draw_y = 0; } /* _NEW_COLOR */ - memcpy(key.color_mask, ctx->Color.ColorMask[0], + memcpy(key.color_mask, ctx->Color.ColorMask[unit], sizeof(key.color_mask)); /* As mentioned above, disable writes to the alpha component when the @@ -587,7 +587,7 @@ brw_update_renderbuffer_surface(struct brw_context *brw, key.color_mask[3] = GL_FALSE; key.color_blend = (!ctx->Color._LogicOpEnabled && - ctx->Color.BlendEnabled); + (ctx->Color.BlendEnabled & (1 << unit))); dri_bo_unreference(brw->wm.surf_bo[unit]); brw->wm.surf_bo[unit] = brw_search_cache(&brw->surface_cache, diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index 6fdd22b9e9..84c8d013e3 100644 --- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -48,6 +48,7 @@ #define need_GL_EXT_blend_func_separate #define need_GL_EXT_blend_minmax #define need_GL_EXT_cull_vertex +#define need_GL_EXT_draw_buffers2 #define need_GL_EXT_fog_coord #define need_GL_EXT_framebuffer_object #define need_GL_EXT_framebuffer_blit @@ -161,6 +162,7 @@ static const struct dri_extension brw_extensions[] = { { "GL_ARB_shadow", NULL }, { "GL_MESA_texture_signed_rgba", NULL }, { "GL_ARB_texture_non_power_of_two", NULL }, + { "GL_EXT_draw_buffers2", GL_EXT_draw_buffers2_functions }, { "GL_EXT_shadow_funcs", NULL }, { "GL_EXT_stencil_two_side", GL_EXT_stencil_two_side_functions }, { "GL_EXT_texture_sRGB", NULL }, -- cgit v1.2.3 From 882279d31a15181316b8bf0f18d558deb13d99a4 Mon Sep 17 00:00:00 2001 From: Corbin Simpson Date: Fri, 29 Jan 2010 09:53:55 -0800 Subject: docs: Mark what I've been up to. Brian, feel free to split/revert if you disagree. --- docs/relnotes-7.8.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/relnotes-7.8.html') diff --git a/docs/relnotes-7.8.html b/docs/relnotes-7.8.html index 6511d613d6..7510139ccd 100644 --- a/docs/relnotes-7.8.html +++ b/docs/relnotes-7.8.html @@ -38,12 +38,14 @@ tbd
  • GL_EXT_draw_buffers2 extension (swrast and i965 driver only)
  • Much improved support for EGL in Mesa
  • New state trackers for OpenGL ES 1.1 and 2.0 +
  • Dedicated documentation for Gallium

    Bug fixes

      -
    • TBD +
    • Massive improvements to the Gallium driver for R300-R500 Radeons; this + driver is now moderately stable but not terribly performant.
    -- cgit v1.2.3