Mesa (master): 31 new commits
Brian Paul
brianp at kemper.freedesktop.org
Sat Dec 24 16:40:22 UTC 2011
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c818c6277247468ccf69abda00f5bc220b59644
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:27 2011 -0700
mesa: consolidate texstore functions
The code for storing 1D, 2D and 3D tex images (whole or sub-images) was
all pretty similar. This consolidates those six paths.
v2: rework switch statement to catch unexpected targets
Reviewed-by: José Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=afebe13986e1ab69c8f80e957653b35aaee2269b
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:27 2011 -0700
mesa: fix _mesa_store_texsubimage2d() for GL_TEXTURE_1D_ARRAY
For 1D arrays, map each slice separately. Note that this was handled
correctly in _mesa_store_teximage2d() but not here.
Reviewed-by: José Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b26aa4c7af189b480b620926eed9560c8e63656
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:27 2011 -0700
mesa: update comment for MapTextureImage()
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c60ac7b17993d28af65b04f9bbbf3ee74c35358c
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:27 2011 -0700
swrast: rewrite glDrawPixels(GL_DEPTH) with zoom
This gets rid of another renderbuffer->PutRow() call and _DepthBuffer
usage. We always work with 32-bit uint Z values now.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf0c0ccbc9424fc73cb17ffb9c9b5feda7d33474
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:27 2011 -0700
swrast: stop using _DepthBuffer in triangle code
The only consequence is we can only use the occlusion_zless_16_triangle()
function with MESA_FORMAT_Z16.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a7b521ff255f5511b6f42becf603c6893f8a51e
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
mesa: remove gl_renderbuffer::PutRowRGB()
No longer used anywhere.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e7bc795784f13068e00c478b94740c8b27789e6
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: stop using PutRowRGB() in triangle code
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=743c664c8c13a7d20beb17290316cd178681482e
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: refactor/rewrite fast_draw_rgba_pixels()
Use Map/UnmapRenderbuffer() for the special, optimized cases we care about.
Note that we're dropping some seldom-used cases in the new fast-path
code: as CI->RGB conversion and zooming.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e66858fb67477db22139fe38d4f23530b7a142a7
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: move swrast_render_start/finish() call in drawpixels code
We don't want to call these functions where we'll be using
Map/UnmapRenderbuffer(). So push them further down in the drawpixels
cases so that we can switch over to Map/UnmapRenderbuffer() step by step.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d9d0d4198f9c76774649b8cad3f10352fd7b5ea5
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: new fast_draw_depth_stencil() for glDrawPixels(GL_DEPTH_STENCIL)
Stop using deprecated renderbuffer PutRow() function. Note that we
aren't using Map/UnmapRenderbuffer() yet because this call is inside
a swrast_render_start/finish() pair.
v2: use _mesa_pack_uint_24_8_depth_stencil_row(), per Eric.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=826f36b1d8ae3881e6095d905fd10a7070742098
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: remove the copy_depth_stencil_pixels() function
Hopefully glCopyPixels(GL_DEPTH_STENCIL) will be handled by the
fast copy function. Otherwise, just do the copy with separate
depth + stencil copies. That's effectively what the removed code
did anyway.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6c6b1c147f5079a1608234294e2b6cd29dd2a64
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: stop using depth/stencil wrappers in CopyPixels code
The functions that read depth/stencil values understand all (packed)
depth/stencil buffer formats now so there's no reason to use the
wrappers.
Also, improve the format checks in fast_copy_pixels() to catch mismatched
depth/stencil cases.
v2: fix the test for combined depth+stencil buffers, per Eric.
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bd31fb346398ca350a5e251a5d104ee1c8b33454
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: remove needless assignment in draw_depth_stencil_pixels()
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7cf2d75d4f5397629a058b9ea9b20df688b79e5c
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swast: replace renderbuffer->GetPointer() with _swrast_pixel_address()
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=242fd9df3b2266402b3f6b20447798fb3bf57d53
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: use _swrast_pixel_address() helper function
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d00d39a016893979d9b4ca61f6eaa570ccafb0b5
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: rewrite stencil test code
Stop using the deprecated renderbuffer Get/Put Row/Values functions.
Consolidate code paths, etc. The file is nearly half the size it used
to be!
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8b913bda3ad20ec2c8353859d75a3d938801d86f
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: remove dead code in s_stencil.c
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=70df474941fa5bd45386370240427944784b7729
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: rewrite _swrast_read_stencil_span()
Use format pack/unpack functions instead of deprecated renderbuffer
GetRow/PutRow functions.
v2: use get_stencil_address(), s/destVals/newVals/
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d6b0927ab6533f0384f463e2ccfc3eb5f80ecf9
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: rewrite _swrast_read_depth_span_float()
Stop using the deprecated renderbuffer GetRow() function.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=82f28c0a12cf04e4fd3c4cfc4658919943fca825
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
mesa: rewrite _swrast_depth_bounds_test()
Stop using the deprecated renderbuffer functions.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=29a9983969f43df5f75483c8196df1963d89cb97
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: rewrite depth-testing code
Consolidate code, stop using the deprecateted renderbuffer Put/Get
Row/Values() functions.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8e7c388b319f5631299cdc43af2f108ce424bb39
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: stop using _swrast_get_values() in z/depth code
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e23e8cbf3965b721f475e489bcb381b1a5d91c0f
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: stop using _swrast_get_values() in stencil code
That function will go a way in the future.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=89fb81d521bdcd341a88d2bf54ae3d79ad232cca
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: do fast_copy_pixels() with Map/UnmapRenderbuffer()
v2: use memmove() instead of memcpy() in case of overlap
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=95970677b92bef1b24cc83ecfe1759b35426d3d2
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: replace GetRow() call with _mesa_unpack_ubyte_stencil_row()
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc41473b9f7d1171a2921a825807889b8fcbcaaf
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
mesa: remove gl_renderbufer::PutMonoRow() and PutMonoValues()
The former was only used for clearing buffers. The later wasn't used
anywhere! Remove them and all implementations of those functions.
Reviewed-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4b5f0cadb18bad22b4c28424723a09832209c6f
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
swrast: rewrite color buffer clearing to use Map/UnmapRenderbuffer()
v2: use _mesa_pack_colormask() helper and fix incorrect masking arithmetic
Reviewed-by: José Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1a2aa5cb338766d7a612b2c82c7ec588ed23d0b
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:26 2011 -0700
mesa: add _mesa_pack_colormask()
For generating bit-wise colormasks for arbitrary pixel formats.
Reviewed-by: José Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=488d7fc67d36bc0e5247f5d011e8ad4c2dceb5a7
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:25 2011 -0700
mesa: add _mesa_get_format_max_bits()
Returns max bits per channel for the given format.
Reviewed-by: José Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd104a84591ae854c5d6adc81e2dc31ef6ab9e8a
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:25 2011 -0700
swrast: do depth/stencil clearing with Map/UnmapRenderbuffer()
Another step toward getting rid of the renderbuffer PutRow/etc functions.
v2: fix assorted depth/stencil clear bugs found by Eric
Reviewed-by: José Fonseca <jfonseca at vmware.com>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb758aab27268593fa6e186d746e8f72831b214d
Author: Brian Paul <brianp at vmware.com>
Date: Sat Dec 24 08:54:25 2011 -0700
mesa: split get_tex_rgba() into compressed/uncompressed versions
This just splits one big function into two smaller ones for better
readability.
Reviewed-by: José Fonseca <jfonseca at vmware.com>
More information about the mesa-commit
mailing list