Mesa (master): 26 new commits

Wed Jul 3 17:50:43 UTC 2013

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=764afc48cf8a762f8c48209ba724103d421f0ac1
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Jul 2 15:53:35 2013 -0700

    i965: Move the rest of intel_tex_layout.c into brw_tex_layout.c.
    
    The texture alignment unit functions are called from brw_tex_layout.c,
    so it makes sense to put them there.  Since the only caller of
    intel_get_texture_alignment_unit() is in brw_tex_layout.c, it could be
    made into a static function.  However, this patch instead simply folds
    it into the caller, as it's only two lines anyway.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=466aa712b695010371228f6032bbed210ca206b2
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Jul 2 15:06:10 2013 -0700

    i965: Push intel_get_texture_alignment_unit call into brw_miptree_layout
    
    intel_miptree_create_layout() calls intel_get_texture_alignment_unit()
    and then immediately calls brw_miptree_layout().  There are no other
    callers.
    
    intel_get_texture_alignment_unit() populates the miptree's alignment
    unit fields, which are used by brw_miptree_layout() to determine where
    to place each miplevel.  Since brw_miptree_layout() needs those to be
    present, it makes sense to have it initialize them as the first step.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4c3c0dc940fb021cef237451b50fb762a97f792
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 15:56:22 2013 -0700

    i965: Declare for-loop counters in the loop in brw_tex_layout.c.
    
    The driver is compiled in C99 mode, so this is not a problem.  It's
    slighlty tidier.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ccf312fd127df16757108cc35905c1dc524a4dac
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 15:49:20 2013 -0700

    i965: Remove use of GLuint/GLint in brw_tex_layout.c.
    
    Using GL types is silly; this isn't even remotely API-facing.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ed95e396f38bbad647152e9357f1da03fdc449eb
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 15:47:28 2013 -0700

    i965: Tidy the brw_tex_layout.c copyright and file header comments.
    
    This uses Doxygen style for the file comments, and generally makes it
    more consistent with the rest of the driver.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ea87fde3124caf3adc51114a3386890dbf5e637
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 15:25:12 2013 -0700

    i965: Move i945_texture_layout_2d to brw_tex_layout.c
    
    This consolidates the miptree layout logic in a single file.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1920209970bba432f2a8c6ccbe2fb84d007e5e93
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 15:06:47 2013 -0700

    i965: Remove fallthrough for Gen4 cube map layout.
    
    Now that both 2DArray and Cube layouts are taken care of by helper
    functions, it's easy to just call the right function for each
    generation.  This is a little cleaner than falling through.
    
    This also reworks the comments.  Referencing "Volume 1" of the BSpec
    isn't very helpful, since that's only available inside Intel, and it
    doesn't even use volume numbers.  Also, "Ironlake...finally" sounds a
    bit strange considering that almost all hardware uses the 2D array
    approach.  At this point, Gen4 is the only special case.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7e4007a1b34ad29ef6441d9b20d0999c32350bd6
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 15:00:07 2013 -0700

    i965: Combine GL_TEXTURE_CUBE_MAP_ARRAY case with the other array cases.
    
    These do the exact same thing; combining them is tidier.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc51f15b320235c06bf666cf870e9995d6cecc6b
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 14:50:30 2013 -0700

    i965: Pull 3D texture layout code out into a helper function.
    
    A bit cleaner than having it in one giant function.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=abc2bdffd6fe814d546a496733162fb1732f4c94
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 19:38:13 2013 -0700

    i965: Replace maxBatchSize variable with BATCH_SZ define.
    
    maxBatchSize was only ever initialized to BATCH_SZ, and a few places
    used BATCH_SZ directly anyway.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c602d2adff5bbe2954fdde63adcea63c2a499ed
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Jul 2 01:19:23 2013 -0700

    i965: Move annotate_aub out of the vtable.
    
    brw_annotate_aub() is the only implementation of this function, so it
    makes sense to just call it directly.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f05f8793c83c05a42eb74fc086b51e01a6b631b7
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 19:36:04 2013 -0700

    i965: Move debug_batch hook out of the vtable.
    
    brw_debug_batch() is the only implementation of this function, so it
    makes sense to just call it directly.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=749160aab3e0de87148732d9d246d6901a2dd820
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 19:30:19 2013 -0700

    i965: Remove render_target_supported from the vtable.
    
    brw_render_target_supported() is the only implementation of this
    function, so it makes sense to just call it directly.
    
    Rather than adding an #include of brw_wm.h, this patch moves the
    prototype to brw_context.h.  Prototypes seem to be in rather arbitrary
    places at the moment, and either place seems as good as the other.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c5279e554ae19ab844798be8cc37a8bf25ecf12
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 19:26:07 2013 -0700

    i965: Move is_hiz_depth_format out of the vtable.
    
    brw_is_hiz_depth_format() is the only implementation of this function,
    so it makes sense to just call it directly.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=607338f1cbb063b1aeaf9d8120903a172c987411
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 19:18:10 2013 -0700

    i965: Remove the invalidate_state() vtable hook.
    
    The hook was a noop.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=251cdcf059a3554f7d76c76147b53add2dc8fd63
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 19:03:06 2013 -0700

    i965: Replace fprintfs with assertions in GLenum comparison translators.
    
    These functions translate GLenum comparison operations into the hardware
    enumerations.  They should never be passed something other than a GL
    comparison operator, or something is very broken.
    
    Assertions seem more appropriate than fprintf.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ee616f1bff9e3c3ee7d01e6079731431b83aa5f
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 18:46:47 2013 -0700

    i965: Replace intel_state.c enums with those from brw_defines.h.
    
    Both intel_context.h and brw_defines.h have #defines for comparison
    functions, stencil ops, blending logic ops, and blending factors.
    They're exactly the same values, so it makes sense to pick one.
    
    brw_defines.h is the logical place for this kind of stuff, so this patch
    converts intel_state.c to use the set defined there.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9db037dc999eadbcaa8816c814e6ec1776d1a40
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 16:35:18 2013 -0700

    i965: Delete pre-DRI2.3 viewport hacks.
    
    The __DRI_USE_INVALIDATE extension was added in May 11th, 2010 by commit
    4258e3a2e1c327.  At this point, it's unlikely that anyone's using the
    right mix of new and old components to hit this path.  Deleting it
    removes an untested code path and cleans up the driver a bit.
    
    Cc: Kristian Høgsberg <krh at bitplanet.net>
    Cc: Keith Packard <keithp at keithp.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cbb37b758673ab53eab1c5b7131fedc6d94724af
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 16:07:40 2013 -0700

    i965: Remove "There are probably better ways" comment.
    
    There are always better ways to do things.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7115bee99300b82c345038bf209d0ed0a29df26e
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 19:53:41 2013 -0700

    i965: Delete brw_print_reg() function.
    
    This wasn't called from anywhere; presumably it was used to examine
    brw_regs when debugging shader assembly.  However, it prints registers
    in a different notation than brw_disasm.c which everyone is used
    to...which means I doubt anyone will want to use it.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc8b62e3a07bb50727332c509115b22ae417796c
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jul 1 21:36:48 2013 -0700

    i965: Move contents of intel_clear.h to intel_context.h.
    
    Having a header file for a single prototype seems rather excessive.
    Plus, the actual function is in brw_clear.c, not intel_clear.c, so
    there isn't even the .c/.h filename symmetry one might expect.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d8e70f301cf9712826b3a3cf935c0a7eceaa08b
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jul 1 21:28:27 2013 -0700

    i965: Move contents of intel_extensions.h to intel_context.h.
    
    Having an entire header file for a single prototype seems a bit
    excessive.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d119880e836258147e0853d4032399a42101e20
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri Jun 28 16:06:26 2013 -0700

    i965: Remove some dead code.
    
    A random smattering of things that just aren't used anymore.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d245e795cfff4ae40ccb9e1ea17e80f66d65ad50
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jul 1 22:16:16 2013 -0700

    i965: Delete dead intel_buffer_object::range_map_size field.
    
    Nothing uses this, apparently.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1f6ebdd43ffdcb26adf41211c3f2e535bfb8d339
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jul 1 21:57:46 2013 -0700

    i965: Remove intel_buffer_object::source.
    
    This was only used for BOs backed by system memory on i915.  With that
    gone, there's nothing that even sets source to non-zero, so this is
    purely dead code.
    
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e5b80ee5a11d13556d30b551d4a16e94ab0ff58
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jul 1 22:08:22 2013 -0700

    i965: Fix buffer object segfault since removal of system memory BOs.
    
    Commit cf31a19300cbcecddb6bd0f878abb9316ebad2a1 removed support for BOs
    backed by system memory, as it was only useful for i915.  However, it
    removed a little too much code: intel_bufferobj_buffer() used to call
    intel_bufferobj_alloc_buffer(), and after that commit, it didn't.
    
    This led to NULL pointer dereferences in several test cases, such as
    es3conform's transform_feedback_state_variables test.
    
    This commit restores the allocation, preserving the original behavior.
    It may not be the cleanest approach, but tidying should come later.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66432
    Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
    Reviewed-by: Chad Versace <chad.versace at linux.intel.com>