[Mesa-dev] [git pull] 8.0 fixes

[Andreas Boll]

2012/9/17 Ian Romanick <idr at freedesktop.org>:
> On 09/17/2012 06:11 PM, Andreas Boll wrote:
>>
>> 2012/9/10 Andreas Boll <andreas.boll.dev at gmail.com>:
>>>
>>> Hi Ian,
>>>
>>> I've rebased on your 8.0-staging branch.
>>> You should probably squash the commit
>>>
>>>    6cabf2532 radeon: fix Base/base typo
>>>
>>> into commit
>>>
>>>    35af2b6fe radeon: set swrast_renderbuffer::ColorType field when
>>> mapping renderbuffers
>>>
>>> to make bisecting easier.
>>>
>>> Andreas.
>>>
>>>
>>> The following changes since commit
>>> eea560125721efa500e2156121335b2417b17809:
>>>
>>>    i965: Add support for GL_SKIP_DECODE_EXT on other SRGB formats.
>>> (2012-09-04 11:35:21 -0700)
>>>
>>> are available in the git repository at:
>>>    git://github.com/andreasboll/mesa.git 8.0-fixes-for-idr
>>>
>>> Alex Deucher (3):
>>>        r600g: 8.0.x support for Trinity
>>>        r600g: add new Sumo, Palm, BTC pci ids
>>>        r600g: add additional evergreen pci ids
>>>
>>> Brian Paul (7):
>>>        st/mesa: fix glCopyTexSubImage crash
>>>        gallivm: fix crash in lp_sampler_static_state()
>>>        st/mesa: fix renderbuffer validation bug
>>>        softpipe: fix softpipe_delete_fs_state() failed assertion
>>>        mesa: raise GL_INVALID_OPERATION in glGenerateMipmap for missing
>>> base image
>>>        st/mesa: s/CALLOC/calloc/ to fix allocation bug
>>>        radeon: fix Base/base typo
>>>
>>> Chad Versace (1):
>>>        swrast: Fix implicit declaration warnings
>>>
>>> Eric Anholt (2):
>>>        i965/vs: Convert EdgeFlagPointer values appropriately for the VS
>>> on gen4.
>>>        i965: Fix accumulator_contains() test to also reject swizzles of
>>> the dst.
>>>
>>> Ian Romanick (3):
>>>        dri2: Fix bug in attribute handling for non-desktop OpenGL
>>> contexts
>>>        mesa: Generate an error when glCopyTexImage border is invalid
>>>        mesa/es: Validate glTexImage border in Mesa code rather than the
>>> ES wrapper
>>>
>>> Kenneth Graunke (3):
>>>        i965/vs: Don't clobber sampler message MRFs with subexpressions.
>>>        intel: Move finish_batch() call before MI_BATCH_BUFFER_END and
>>> padding.
>>>        i965/fs: Don't use brw->fragment_program in calculate_urb_setup().
>>>
>>> Marek Olšák (1):
>>>        gallium/u_blit: set dst format from pipe_resource, not
>>> pipe_surface
>>>
>>> Niels Ole Salscheider (1):
>>>        st/mesa: index can be negative in the PROGRAM_CONSTANT case
>>>
>>> Stéphane Marchesin (1):
>>>        glsl/linker: Avoid buffer over-run in
>>> parcel_out_uniform_storage::visit_field
>>>
>>>   include/pci_ids/r600_pci_ids.h                  |   33 +++++++++++++
>>>   src/gallium/auxiliary/gallivm/lp_bld_sample.c   |    7 +--
>>>   src/gallium/auxiliary/util/u_blit.c             |    2 +-
>>>   src/gallium/drivers/r600/evergreen_hw_context.c |    4 +-
>>>   src/gallium/drivers/r600/r600.h                 |    1 +
>>>   src/gallium/drivers/r600/r600_pipe.c            |    3 +-
>>>   src/gallium/drivers/softpipe/sp_state_shader.c  |    6 ++-
>>>   src/glsl/link_uniforms.cpp                      |    2 +-
>>>   src/mesa/drivers/dri/common/dri_util.c          |   23 +++++++--
>>>   src/mesa/drivers/dri/i965/brw_draw_upload.c     |   10 ++++
>>>   src/mesa/drivers/dri/i965/brw_fs.cpp            |    2 +-
>>>   src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp  |   59
>>> ++++++++++++++++-------
>>>   src/mesa/drivers/dri/i965/brw_vs_emit.c         |    2 +-
>>>   src/mesa/drivers/dri/intel/intel_batchbuffer.c  |    6 +-
>>>   src/mesa/drivers/dri/radeon/radeon_span.c       |    2 +-
>>>   src/mesa/main/APIspec.xml                       |    8 ---
>>>   src/mesa/main/fbobject.c                        |    2 +
>>>   src/mesa/main/teximage.c                        |    8 ++-
>>>   src/mesa/state_tracker/st_cb_fbo.c              |    6 ++
>>>   src/mesa/state_tracker/st_cb_texture.c          |   10 ++++-
>>>   src/mesa/state_tracker/st_glsl_to_tgsi.cpp      |    2 +-
>>>   src/mesa/state_tracker/st_mesa_to_tgsi.c        |    2 +-
>>>   src/mesa/swrast/s_context.h                     |    1 +
>>>   23 files changed, 148 insertions(+), 53 deletions(-)
>>
>>
>> Hi Ian,
>>
>> can I do anything to help you with the release of mesa 8.0.5?
>
>
> I've been traveling across 5 different countries in Europe since September
> 7.  I apologize for having been a little busy.  I will take care of it as
> soon as I can.
>

Hi Ian,

can I push your 8.0-staging and my 8.0-fixes-for-idr branch to the 8.0 branch?
After that I'll evaluate what candidates are missing.
Then I'll cherry-pick those without conflicts and make another pull request.

Andreas.